diff --git a/code/datums/datumvars.dm b/code/datums/datumvars.dm
index 10b1886e89e..ed93eb9369a 100644
--- a/code/datums/datumvars.dm
+++ b/code/datums/datumvars.dm
@@ -389,14 +389,14 @@ body
 	else if (isfile(value))
 		html += "[html_encode(name)] = <span class='value'>'[value]'</span>"
 
+	else if (istype(value, /client))
+		var/client/C = value
+		html += "<a href='?_src_=vars;Vars=\ref[value]'>[html_encode(name)] \ref[value]</a> = [C] [C.type]"
+
 	else if (istype(value, /datum))
 		var/datum/D = value
 		html += "<a href='?_src_=vars;Vars=\ref[value]'>[html_encode(name)] \ref[value]</a> = [D.type]"
 
-	else if (istype(value, /client))
-		var/client/C = value
-		html += "<a href='?_src_=vars;Vars=\ref[value]'>[html_encode(name)] \ref[value]</a> = [C] [C.type]"
-//
 	else if (istype(value, /list))
 		var/list/L = value
 		html += "[html_encode(name)] = /list ([L.len])"
@@ -529,8 +529,8 @@ body
 				return
 
 			var/D = locate(href_list["datumedit"])
-			if(!istype(D,/datum) && !istype(D,/client))
-				usr << "This can only be used on instances of types /client or /datum"
+			if(!istype(D,/datum))
+				usr << "This can only be used on datums"
 				return
 
 			modify_variables(D, href_list["varnameedit"], 1)
@@ -540,8 +540,8 @@ body
 				return
 
 			var/D = locate(href_list["datumchange"])
-			if(!istype(D,/datum) && !istype(D,/client))
-				usr << "This can only be used on instances of types /client or /datum"
+			if(!istype(D,/datum))
+				usr << "This can only be used on datums"
 				return
 
 			modify_variables(D, href_list["varnamechange"], 0)
diff --git a/code/modules/admin/verbs/modifyvariables.dm b/code/modules/admin/verbs/modifyvariables.dm
index 4b4a3364196..1a006fce385 100644
--- a/code/modules/admin/verbs/modifyvariables.dm
+++ b/code/modules/admin/verbs/modifyvariables.dm
@@ -471,6 +471,10 @@ var/list/VVckey_edit = list("key", "ckey")
 				var_value = "\icon[var_value]"
 				class = "icon"
 
+			else if(istype(var_value,/client))
+				usr << "Variable appears to be <b>CLIENT</b>."
+				class = "cancel"
+
 			else if(istype(var_value,/atom) || istype(var_value,/datum))
 				usr << "Variable appears to be <b>TYPE</b>."
 				class = "type"
@@ -479,10 +483,6 @@ var/list/VVckey_edit = list("key", "ckey")
 				usr << "Variable appears to be <b>LIST</b>."
 				class = "list"
 
-			else if(istype(var_value,/client))
-				usr << "Variable appears to be <b>CLIENT</b>."
-				class = "cancel"
-
 			else
 				usr << "Variable appears to be <b>FILE</b>."
 				class = "file"
@@ -535,6 +535,10 @@ var/list/VVckey_edit = list("key", "ckey")
 			var_value = "\icon[var_value]"
 			default = "icon"
 
+		else if(istype(var_value,/client))
+			usr << "Variable appears to be <b>CLIENT</b>."
+			default = "cancel"
+
 		else if(istype(var_value,/atom) || istype(var_value,/datum))
 			usr << "Variable appears to be <b>TYPE</b>."
 			default = "type"
@@ -543,10 +547,6 @@ var/list/VVckey_edit = list("key", "ckey")
 			usr << "Variable appears to be <b>LIST</b>."
 			default = "list"
 
-		else if(istype(var_value,/client))
-			usr << "Variable appears to be <b>CLIENT</b>."
-			default = "cancel"
-
 		else
 			usr << "Variable appears to be <b>FILE</b>."
 			default = "file"