diff --git a/luascripts/wolfadmin/commands/admin/shufflesr.lua b/luascripts/wolfadmin/commands/admin/shufflesr.lua
index a353c32..5961ba2 100644
--- a/luascripts/wolfadmin/commands/admin/shufflesr.lua
+++ b/luascripts/wolfadmin/commands/admin/shufflesr.lua
@@ -26,4 +26,4 @@ function commandShuffleSR(clientId, command)
 
     return true
 end
-commands.addadmin("shufflesr", commandShuffleSR, auth.PERM_SHUFFLE, "shuffle the teams by Skill Rating to try and even them", nil, nil, (settings.get("fs_game") == "legacy"))
+commands.addadmin("shufflesr", commandShuffleSR, auth.PERM_SHUFFLE, "shuffle the teams by Skill Rating to try and even them", nil, nil, (settings.get("fs_game") ~= "legacy"))
diff --git a/luascripts/wolfadmin/commands/client/pm.lua b/luascripts/wolfadmin/commands/client/pm.lua
index 34e911f..89e375e 100644
--- a/luascripts/wolfadmin/commands/client/pm.lua
+++ b/luascripts/wolfadmin/commands/client/pm.lua
@@ -91,5 +91,5 @@ function commandPersonalMessage(clientId, command, target, ...)
 
     return true
 end
-commands.addclient("pm", commandPersonalMessage, "", "[^2name^7|^2slot#^7] [^2message^7]", true, (settings.get("fs_game") == "legacy"))
-commands.addclient("m", commandPersonalMessage, "", "[^2name^7|^2slot#^7] [^2message^7]", true, (settings.get("fs_game") == "legacy"))
+commands.addclient("pm", commandPersonalMessage, "", "[^2name^7|^2slot#^7] [^2message^7]", true, (settings.get("fs_game") ~= "legacy"))
+commands.addclient("m", commandPersonalMessage, "", "[^2name^7|^2slot#^7] [^2message^7]", true, (settings.get("fs_game") ~= "legacy"))
diff --git a/luascripts/wolfadmin/commands/server/ccpm.lua b/luascripts/wolfadmin/commands/server/ccpm.lua
index 88b2a7c..37a65a0 100644
--- a/luascripts/wolfadmin/commands/server/ccpm.lua
+++ b/luascripts/wolfadmin/commands/server/ccpm.lua
@@ -19,11 +19,12 @@ local commands = wolfa_requireModule("commands.commands")
 
 local util = wolfa_requireModule("util.util")
 
-function commandClientCPM(command, clientId, text)
+function commandClientCPM(command, clientId, text, type)
     local clientId = tonumber(clientId)
+    local type = tonumber(type) and tonumber(type) or 4
 
     if clientId and clientId ~= -1337 then -- -1337 because -1 is a magic number/broadcasted to all clients
-        et.trap_SendServerCommand(clientId, "cpm \""..text.."\";")
+        et.trap_SendServerCommand(clientId, "cpm \""..text.."\" "..type..";")
     elseif clientId then
         et.G_Print(util.removeColors(text).."\n")
     end