Removed username from everything.  Email is the primary sign-in