Trying improve the login