AuthenticationService fix