Added username and missing validation