Improved the Auth Controller