Fix for username password validation