diff --git a/src/functions/login.sh b/src/functions/login.sh
index 09aece6..3f43e1e 100644
--- a/src/functions/login.sh
+++ b/src/functions/login.sh
@@ -6,14 +6,15 @@ wx-login(){
 
     ORG=$1
 
-    if [[ -z "$HOSTNAME" || ${#HOSTNAME} -lt 5 ]]; then
+    if [[ -z "$HOSTNAME" || ${#HOSTNAME} -lt 5 ]]
+    then
         wx-stop
     fi
 
     if [[ $(hostname -d) == "devices.waren.io" ]]
     then
         ORG=warengroup
-    elif [[ $(hostname -d) == "devices.cwinfo.net" ]]
+    elif [[ $(hostname -d) == "devices.cwinfo.net" || $(hostname -d) == "fr1.servers.devices.cwinfo.net" ]]
     then
         ORG=cwinfo
     elif [[ $(hostname -d) == "devices.christerwaren.fi" ]]
diff --git a/wx b/wx
index 1158d33..dde7e8a 100755
--- a/wx
+++ b/wx
@@ -28,14 +28,15 @@ wx-login(){
 
     ORG=$1
 
-    if [[ -z "$HOSTNAME" || ${#HOSTNAME} -lt 5 ]]; then
+    if [[ -z "$HOSTNAME" || ${#HOSTNAME} -lt 5 ]]
+    then
         wx-stop
     fi
 
     if [[ $(hostname -d) == "devices.waren.io" ]]
     then
         ORG=warengroup
-    elif [[ $(hostname -d) == "devices.cwinfo.net" ]]
+    elif [[ $(hostname -d) == "devices.cwinfo.net" || $(hostname -d) == "fr1.servers.devices.cwinfo.net" ]]
     then
         ORG=cwinfo
     elif [[ $(hostname -d) == "devices.christerwaren.fi" ]]