diff --git a/scripts/server/moderation.js b/scripts/server/moderation.js
index e6599692..0bb603ac 100644
--- a/scripts/server/moderation.js
+++ b/scripts/server/moderation.js
@@ -678,6 +678,11 @@ function addStaffFlagCommand(command, params, client) {
         return false;
     }
 
+	if(getStaffFlagValue(flagName) == false) {
+		messagePlayerError(client, "That staff flag doesn't exist!");
+        return false;
+	}
+
 	// Prevent setting flags on admins with really high permissions
     if(doesPlayerHaveStaffPermission(targetClient, getStaffFlagValue("ManageServer")) || doesPlayerHaveStaffPermission(targetClient, getStaffFlagValue("Developer"))) {
 		if(!doesPlayerHaveStaffPermission(client, getStaffFlagValue("ManageServer")) && !doesPlayerHaveStaffPermission(client, getStaffFlagValue("Developer"))) {
@@ -686,11 +691,6 @@ function addStaffFlagCommand(command, params, client) {
 		}
 	}
 
-	if(!getStaffFlagValue(flagName)) {
-		messagePlayerError(client, "That staff flag doesn't exist!");
-        return false;
-	}
-
 	givePlayerStaffFlag(targetClient, flagName);
 	messageAdmins(`${client.name} has {MAINCOLOUR}given {ALTCOLOUR}${getPlayerName(targetClient)} {MAINCOLOUR}the {ALTCOLOUR}${flagName} {MAINCOLOUR}staff flag`);
 }
@@ -712,6 +712,11 @@ function takeStaffFlagCommand(command, params, client) {
         return false;
     }
 
+	if(getStaffFlagValue(flagName) == false) {
+		messagePlayerError(client, "That staff flag doesn't exist!");
+        return false;
+	}
+
 	// Prevent setting flags on admins with really high permissions
     if(doesPlayerHaveStaffPermission(targetClient, getStaffFlagValue("ManageServer")) || doesPlayerHaveStaffPermission(targetClient, getStaffFlagValue("Developer"))) {
 		if(!doesPlayerHaveStaffPermission(client, getStaffFlagValue("ManageServer")) && !doesPlayerHaveStaffPermission(client, getStaffFlagValue("Developer"))) {
@@ -720,11 +725,6 @@ function takeStaffFlagCommand(command, params, client) {
 		}
 	}
 
-	if(!getStaffFlagValue(flagName)) {
-		messagePlayerError(client, "That staff flag doesn't exist!");
-        return false;
-	}
-
 	takePlayerStaffFlag(targetClient, flagName);
 	messageAdmins(`${client.name} {MAINCOLOUR}has taken the {ALTCOLOUR}${flagName} {MAINCOLOUR}staff flag from {ALTCOLOUR}${getPlayerName(targetClient)}`);
 }
@@ -739,7 +739,6 @@ function clearStaffFlagsCommand(command, params, client) {
 
 	let splitParams = params.split("");
 	let targetClient = getPlayerFromParams(splitParams[0]);
-	let flagName = splitParams[1] || "None";
 
     if(!targetClient) {
         messagePlayerError(client, "That player is not connected!");
@@ -754,11 +753,6 @@ function clearStaffFlagsCommand(command, params, client) {
 		}
 	}
 
-	if(!getStaffFlagValue(flagName)) {
-		messagePlayerError(client, "That staff flag doesn't exist!");
-        return false;
-	}
-
 	clearPlayerStaffFlags(targetClient);
 	messageAdmins(`${client.name} {MAINCOLOUR}removed all staff flags from {ALTCOLOUR}${getPlayerName(targetClient)}`);
 }
@@ -809,7 +803,7 @@ function getStaffFlagsCommand(command, params, client) {
 		}
 	}
 
-	let chunkedList = splitArrayIntoChunks(flagList, 6);
+	let chunkedList = splitArrayIntoChunks(flagList, 8);
 
 	messagePlayerInfo(client, `{clanOrange}== {jobYellow}Player Staff Flags {clanOrange}=========================`);