Login should be an email address only and users should be cleanedup