Changed login from email to intad username, added email lookup