Added email_with_name to user