Issue #3410707 by alexpott, catch: Optimize UserAuthenticationController by remove duplicate entity queries