Changed some code for the email users