Minor modifications to authentication system