Issue #547 - Fix login username hint
Merge pull request #549 from ndomar/bugFix_#547

Bug: Login hint asks for an email but the login happens using a username
Issue #363 - Fix conflicts