diff --git a/src/commands/auth/login.sh b/src/commands/auth/login.sh
index 9184da3..b928ed8 100644
--- a/src/commands/auth/login.sh
+++ b/src/commands/auth/login.sh
@@ -61,6 +61,7 @@ wx-login(){
         if [[ -z $VAULT_LOGIN || ${#VAULT_LOGIN} -lt 95 || ${#VAULT_LOGIN} -gt 95 ]]
         then
           wxi-content status "Login" "Failed"
+          wxi-footer
           wxi-stop
         fi
 
@@ -105,7 +106,10 @@ wx-login(){
         if [[ -z $VAULT_LOGIN || ${#VAULT_LOGIN} -lt 95 || ${#VAULT_LOGIN} -gt 95 ]]
         then
           wxi-content status "Login" "Failed"
-          wxi-stop
+          wxi-footer
+          wx-logout &> /dev/null
+          wx-login
+          #wxi-stop
         fi
 
         TOKEN=$VAULT_LOGIN
diff --git a/src/commands/auth/logout.sh b/src/commands/auth/logout.sh
index bfe5ab3..7315cb3 100644
--- a/src/commands/auth/logout.sh
+++ b/src/commands/auth/logout.sh
@@ -17,7 +17,6 @@ wx-logout(){
     TOKEN=""
     wxi-config login
     wxi-footer
-    wxi-stop
   fi
 
 }
diff --git a/src/commands/infra.sh b/src/commands/infra.sh
index b39b1ae..4ae5394 100644
--- a/src/commands/infra.sh
+++ b/src/commands/infra.sh
@@ -1,5 +1,5 @@
 wx-infra(){
-  wx-login &> /dev/null
+  wx-login
   wx-auto &> /dev/null
 
   wxi-header "Infra"
diff --git a/src/commands/management/auto.sh b/src/commands/management/auto.sh
index b93d45d..183bdf2 100644
--- a/src/commands/management/auto.sh
+++ b/src/commands/management/auto.sh
@@ -1,5 +1,5 @@
 wx-auto(){
-  wx-login &> /dev/null
+  wx-login
 
   wxi-header "Auto"
   wxi-restricted
diff --git a/src/commands/management/settings.sh b/src/commands/management/settings.sh
index b45068d..d33bf10 100644
--- a/src/commands/management/settings.sh
+++ b/src/commands/management/settings.sh
@@ -1,5 +1,5 @@
 wx-settings(){
-  wx-login &> /dev/null
+  wx-login
   wx-auto &> /dev/null
 
   wxi-header "Settings"
diff --git a/wx b/wx
index 1cf5342..5ef54db 100755
--- a/wx
+++ b/wx
@@ -271,7 +271,7 @@ wxi-footer
 }
 
 wx-infra(){
-  wx-login &> /dev/null
+  wx-login
   wx-auto &> /dev/null
 
   wxi-header "Infra"
@@ -455,6 +455,7 @@ wx-login(){
         if [[ -z $VAULT_LOGIN || ${#VAULT_LOGIN} -lt 95 || ${#VAULT_LOGIN} -gt 95 ]]
         then
           wxi-content status "Login" "Failed"
+          wxi-footer
           wxi-stop
         fi
 
@@ -499,7 +500,10 @@ wx-login(){
         if [[ -z $VAULT_LOGIN || ${#VAULT_LOGIN} -lt 95 || ${#VAULT_LOGIN} -gt 95 ]]
         then
           wxi-content status "Login" "Failed"
-          wxi-stop
+          wxi-footer
+          wx-logout &> /dev/null
+          wx-login
+          #wxi-stop
         fi
 
         TOKEN=$VAULT_LOGIN
@@ -552,7 +556,6 @@ wx-logout(){
     TOKEN=""
     wxi-config login
     wxi-footer
-    wxi-stop
   fi
 
 }
@@ -621,7 +624,7 @@ wx-update(){
 }
 
 wx-auto(){
-  wx-login &> /dev/null
+  wx-login
 
   wxi-header "Auto"
   wxi-restricted
@@ -642,7 +645,7 @@ wx-clean(){
 }
 
 wx-settings(){
-  wx-login &> /dev/null
+  wx-login
   wx-auto &> /dev/null
 
   wxi-header "Settings"
@@ -839,7 +842,10 @@ wxi-ssh-keys-sign(){
 
   if [[ $USERNAME == "cwchristerw" ]]
   then
+    wxi-ssh-keys-sign-create cwchristerw sysadmin 3600
     wxi-ssh-keys-sign-create warengroup sysadmin 3600
+  else
+    wxi-ssh-keys-sign-create $ORG sysadmin 3600
   fi
   wxi-footer
 }