Added validation for user names and email