Add username and email validation