diff --git a/setup/lib/main.lib.php b/setup/lib/main.lib.php
index 9ed4639..91b5c62 100644
--- a/setup/lib/main.lib.php
+++ b/setup/lib/main.lib.php
@@ -104,16 +104,16 @@ function validate() {
 		$err [] = $fpuser . " is not a valid username. 
 		Username must be alphanumeric and should not contain spaces.";
 	}
+	if (!(preg_match('/^[a-zA-Z0-9]+_?[a-zA-Z0-9]+$/D', $fpuser) || preg_match('/^[a-zA-Z0-9]+_?[a-zA-Z0-9]+$/D', $fpuser))) {
+		$err [] = $fpuser . " is not a valid username.
+		Username can only contain letters, numbers and 1 underscore.";
+	}
 	if (strlen(trim(($fppwd))) < 6) {
 		$err [] = "Password must contain at least 6 non-space characters";
 	}
 	if (($fppwd) != ($fppwd2)) {
 		$err [] = "Passwords did not match";
 	}
-	if (!(preg_match('/^[a-zA-Z0-9]+_?[a-zA-Z0-9]+$/D', $fpuser) || preg_match('/^[a-zA-Z0-9]+_?[a-zA-Z0-9]+$/D', $fpuser))) {
-		$err [] = $fpuser . " is not a valid username.
-		Username can only contain letters, numbers and 1 underscore.";
-	}
 	if (!(preg_match('!@.*@|\.\.|\,|\;!', $email) || preg_match('!^.+\@(\[?)[a-zA-Z0-9\.\-]+\.([a-zA-Z]{2,4}|[0-9]{1,3})(\]?)$!', $email))) {
 		$err [] = $email . " is not a valid email address";
 	}