Added username email validation