Fixing username and allowing to login w/ username