Added validations and display user's name instead of email