AuthService improved