diff --git a/init.sh b/init.sh
index d504527..1a10e8c 100755
--- a/init.sh
+++ b/init.sh
@@ -68,7 +68,7 @@ wi-init(){
     wi-login $1
     wi-header "Init"
 
-    if [[ ! -z $2 && ${#$2} -gt 5 ]]
+    if [[ ! -z $2 && ${#2} -gt 5 ]]
     then
         HOSTNAME="$2.$DEVICE_DOMAIN"
     elif [[ $(hostname -d) ]]
@@ -190,7 +190,10 @@ wx-login(){
 
         if [[ $USER != "root" && $USER != "local" && -f "$HOME/.warengroup/config.json" ]]
         then
-            USERNAME="$(cat $HOME/.warengroup/config.json | jq -r .login.$ORG.username)"
+            if [[ $(cat $HOME/.warengroup/config.json | jq -r .login.$ORG.username) != "null" ]]
+            then
+                USERNAME="$(cat $HOME/.warengroup/config.json | jq -r .login.$ORG.username)"
+            fi
             TOKEN="$(cat $HOME/.warengroup/config.json | jq -r .login.$ORG.token)"
         fi
 
diff --git a/src/functions/init.sh b/src/functions/init.sh
index 94d62f3..a6ca65a 100644
--- a/src/functions/init.sh
+++ b/src/functions/init.sh
@@ -2,7 +2,7 @@ wi-init(){
     wi-login $1
     wi-header "Init"
 
-    if [[ ! -z $2 && ${#$2} -gt 5 ]]
+    if [[ ! -z $2 && ${#2} -gt 5 ]]
     then
         HOSTNAME="$2.$DEVICE_DOMAIN"
     elif [[ $(hostname -d) ]]
diff --git a/src/functions/login.sh b/src/functions/login.sh
index bdffb36..7940996 100644
--- a/src/functions/login.sh
+++ b/src/functions/login.sh
@@ -67,7 +67,10 @@ wx-login(){
 
         if [[ $USER != "root" && $USER != "local" && -f "$HOME/.warengroup/config.json" ]]
         then
-            USERNAME="$(cat $HOME/.warengroup/config.json | jq -r .login.$ORG.username)"
+            if [[ $(cat $HOME/.warengroup/config.json | jq -r .login.$ORG.username) != "null" ]]
+            then
+                USERNAME="$(cat $HOME/.warengroup/config.json | jq -r .login.$ORG.username)"
+            fi
             TOKEN="$(cat $HOME/.warengroup/config.json | jq -r .login.$ORG.token)"
         fi