Revert "Issue #3410707 by alexpott, catch: Optimize UserAuthenticationController by remove duplicate entity queries" This reverts commit a3b755e7.
mentioned in commit 5ae001e7