Fixed enter to login
Cleaning up