Changed email to username