Switched for email to username as login id