Added username and email validation