Added validation of username & email