diff --git a/src/commands/ssh/keys.sh b/src/commands/ssh/keys.sh
index 47975fa..fcff0a6 100644
--- a/src/commands/ssh/keys.sh
+++ b/src/commands/ssh/keys.sh
@@ -47,13 +47,13 @@ wx-ssh-keys-sign(){
     wx-header "SSH / Keys / Sign"
     wx-restricted
 
-    if [[ $ORG == "warengroup" ]]
+    if [[ $ORG == "warengroup" && $USERNAME != "cwchristerw" ]]
     then
         wx-ssh-keys-sign-create warengroup sysadmin 3600
-    elif [[ $ORG == "cwinfo" ]]
+    elif [[ $ORG == "cwinfo" && $USERNAME != "cwchristerw" ]]
     then
         wx-ssh-keys-sign-create cwinfo sysadmin 3600
-    elif [[ $ORG == "cwchristerw" ]]
+    elif [[ $ORG == "cwchristerw" || $USERNAME == "cwchristerw" ]]
     then
         wx-ssh-keys-sign-create warengroup sysadmin 3600
         wx-ssh-keys-sign-create cwinfo sysadmin 3600
@@ -144,13 +144,13 @@ wx-ssh-keys-clean(){
             rm "$HOME/.ssh/keys/$1.sig" &> /dev/null
         fi
     else
-        if [[ $ORG == "warengroup" ]]
+        if [[ $ORG == "warengroup" && $USERNAME != "cwchristerw" ]]
         then
             wx-ssh-keys-clean warengroup
-        elif [[ $ORG == "cwinfo" ]]
+        elif [[ $ORG == "cwinfo" && $USERNAME != "cwchristerw" ]]
         then
             wx-ssh-keys-clean cwinfo
-        elif [[ $ORG == "cwchristerw" ]]
+        elif [[ $ORG == "cwchristerw" || $USERNAME == "cwchristerw" ]]
         then
             wx-ssh-keys-clean warengroup
             wx-ssh-keys-clean cwinfo
diff --git a/wx b/wx
index da766ad..0d3f4d2 100755
--- a/wx
+++ b/wx
@@ -576,13 +576,13 @@ wx-ssh-keys-sign(){
     wx-header "SSH / Keys / Sign"
     wx-restricted
 
-    if [[ $ORG == "warengroup" ]]
+    if [[ $ORG == "warengroup" && $USERNAME != "cwchristerw" ]]
     then
         wx-ssh-keys-sign-create warengroup sysadmin 3600
-    elif [[ $ORG == "cwinfo" ]]
+    elif [[ $ORG == "cwinfo" && $USERNAME != "cwchristerw" ]]
     then
         wx-ssh-keys-sign-create cwinfo sysadmin 3600
-    elif [[ $ORG == "cwchristerw" ]]
+    elif [[ $ORG == "cwchristerw" || $USERNAME == "cwchristerw" ]]
     then
         wx-ssh-keys-sign-create warengroup sysadmin 3600
         wx-ssh-keys-sign-create cwinfo sysadmin 3600
@@ -673,13 +673,13 @@ wx-ssh-keys-clean(){
             rm "$HOME/.ssh/keys/$1.sig" &> /dev/null
         fi
     else
-        if [[ $ORG == "warengroup" ]]
+        if [[ $ORG == "warengroup" && $USERNAME != "cwchristerw" ]]
         then
             wx-ssh-keys-clean warengroup
-        elif [[ $ORG == "cwinfo" ]]
+        elif [[ $ORG == "cwinfo" && $USERNAME != "cwchristerw" ]]
         then
             wx-ssh-keys-clean cwinfo
-        elif [[ $ORG == "cwchristerw" ]]
+        elif [[ $ORG == "cwchristerw" || $USERNAME == "cwchristerw" ]]
         then
             wx-ssh-keys-clean warengroup
             wx-ssh-keys-clean cwinfo