solved issues with AuthenticationService