Add user and email validation 6.2.3