Improved the AuthenticationController