Added Email field to user creating and updated logic