Bug: Login hint asks for an email but the login happens using a username

Issue #547 
@maisaraFarahat