diff --git a/src/commands/auth/login.sh b/src/commands/auth/login.sh
index a100c7d..bdffb36 100644
--- a/src/commands/auth/login.sh
+++ b/src/commands/auth/login.sh
@@ -67,7 +67,8 @@ wx-login(){
 
         if [[ $USER != "root" && $USER != "local" && -f "$HOME/.warengroup/config.json" ]]
         then
-            TOKEN="$(cat $HOME/.warengroup/config.json | jq -r .login.$ORG)"
+            USERNAME="$(cat $HOME/.warengroup/config.json | jq -r .login.$ORG.username)"
+            TOKEN="$(cat $HOME/.warengroup/config.json | jq -r .login.$ORG.token)"
         fi
 
         VAULT_LOGIN=$(curl https://$VAULT_DOMAIN/v1/auth/token/renew -X POST --header "X-Vault-Token: $TOKEN" -d '{ "token": "'$TOKEN'" }' -s | jq -r '.auth.client_token')
@@ -76,7 +77,7 @@ wx-login(){
             config["login",${ORG}]=$VAULT_LOGIN
             if [[ $USER != "root" && $USER != "local" ]]
             then
-                jq '.login.'$ORG' = "'$VAULT_LOGIN'"' $HOME/.warengroup/config.json 1> $HOME/.warengroup/config.json.tmp
+                jq '.login.'$ORG'.token = "'$VAULT_LOGIN'"' $HOME/.warengroup/config.json 1> $HOME/.warengroup/config.json.tmp
                 mv $HOME/.warengroup/config.json.tmp $HOME/.warengroup/config.json &> /dev/null
             fi
         else
@@ -94,6 +95,9 @@ wx-login(){
                     echo "Username: $USERNAME"
                 fi
 
+                jq '.login.'$ORG'.username = "'$USERNAME'"' $HOME/.warengroup/config.json 1> $HOME/.warengroup/config.json.tmp
+                mv $HOME/.warengroup/config.json.tmp $HOME/.warengroup/config.json &> /dev/null
+
                 echo -n "Password: "
                 read -s PASSWORD
                 echo "****************"
@@ -114,7 +118,7 @@ wx-login(){
 
                     if [[ $USER != "root" && $USER != "local" ]]
                     then
-                        jq '.login.'$ORG' = "'$VAULT_LOGIN'"' $HOME/.warengroup/config.json &> $HOME/.warengroup/config.json.tmp
+                        jq '.login.'$ORG'.token = "'$VAULT_LOGIN'"' $HOME/.warengroup/config.json &> $HOME/.warengroup/config.json.tmp
                         mv $HOME/.warengroup/config.json.tmp $HOME/.warengroup/config.json &> /dev/null
                     fi
                 fi
@@ -143,7 +147,7 @@ wx-login(){
 
                 if [[ $USER != "root" && $USER != "local" ]]
                 then
-                    jq '.login.'$ORG' = "'$VAULT_LOGIN'"' $HOME/.warengroup/config.json &> $HOME/.warengroup/config.json.tmp
+                    jq '.login.'$ORG'.token = "'$VAULT_LOGIN'"' $HOME/.warengroup/config.json &> $HOME/.warengroup/config.json.tmp
                     mv $HOME/.warengroup/config.json.tmp $HOME/.warengroup/config.json &> /dev/null
                 fi
             fi
diff --git a/wx b/wx
index c70ebfc..7c3eae6 100755
--- a/wx
+++ b/wx
@@ -297,7 +297,8 @@ wx-login(){
 
         if [[ $USER != "root" && $USER != "local" && -f "$HOME/.warengroup/config.json" ]]
         then
-            TOKEN="$(cat $HOME/.warengroup/config.json | jq -r .login.$ORG)"
+            USERNAME="$(cat $HOME/.warengroup/config.json | jq -r .login.$ORG.username)"
+            TOKEN="$(cat $HOME/.warengroup/config.json | jq -r .login.$ORG.token)"
         fi
 
         VAULT_LOGIN=$(curl https://$VAULT_DOMAIN/v1/auth/token/renew -X POST --header "X-Vault-Token: $TOKEN" -d '{ "token": "'$TOKEN'" }' -s | jq -r '.auth.client_token')
@@ -306,7 +307,7 @@ wx-login(){
             config["login",${ORG}]=$VAULT_LOGIN
             if [[ $USER != "root" && $USER != "local" ]]
             then
-                jq '.login.'$ORG' = "'$VAULT_LOGIN'"' $HOME/.warengroup/config.json 1> $HOME/.warengroup/config.json.tmp
+                jq '.login.'$ORG'.token = "'$VAULT_LOGIN'"' $HOME/.warengroup/config.json 1> $HOME/.warengroup/config.json.tmp
                 mv $HOME/.warengroup/config.json.tmp $HOME/.warengroup/config.json &> /dev/null
             fi
         else
@@ -324,6 +325,9 @@ wx-login(){
                     echo "Username: $USERNAME"
                 fi
 
+                jq '.login.'$ORG'.username = "'$USERNAME'"' $HOME/.warengroup/config.json 1> $HOME/.warengroup/config.json.tmp
+                mv $HOME/.warengroup/config.json.tmp $HOME/.warengroup/config.json &> /dev/null
+
                 echo -n "Password: "
                 read -s PASSWORD
                 echo "****************"
@@ -344,7 +348,7 @@ wx-login(){
 
                     if [[ $USER != "root" && $USER != "local" ]]
                     then
-                        jq '.login.'$ORG' = "'$VAULT_LOGIN'"' $HOME/.warengroup/config.json &> $HOME/.warengroup/config.json.tmp
+                        jq '.login.'$ORG'.token = "'$VAULT_LOGIN'"' $HOME/.warengroup/config.json &> $HOME/.warengroup/config.json.tmp
                         mv $HOME/.warengroup/config.json.tmp $HOME/.warengroup/config.json &> /dev/null
                     fi
                 fi
@@ -373,7 +377,7 @@ wx-login(){
 
                 if [[ $USER != "root" && $USER != "local" ]]
                 then
-                    jq '.login.'$ORG' = "'$VAULT_LOGIN'"' $HOME/.warengroup/config.json &> $HOME/.warengroup/config.json.tmp
+                    jq '.login.'$ORG'.token = "'$VAULT_LOGIN'"' $HOME/.warengroup/config.json &> $HOME/.warengroup/config.json.tmp
                     mv $HOME/.warengroup/config.json.tmp $HOME/.warengroup/config.json &> /dev/null
                 fi
             fi