Changed email to username for simplication