changed user email to username for login etc
changed email logon to username logon