Added validations and User Name