diff --git a/files/lib/gluon/ssid-changer/ssid-changer.sh b/files/lib/gluon/ssid-changer/ssid-changer.sh
index 19ee9e974f5aed9d76799f009e51188436fbf1cc..a637efd0bf6d2ee38fdcbf35011c23ebacd8c0cd 100755
--- a/files/lib/gluon/ssid-changer/ssid-changer.sh
+++ b/files/lib/gluon/ssid-changer/ssid-changer.sh
@@ -1,20 +1,25 @@
+
 #!/bin/sh
 
+# At first some Definitions:
+
+ONLINE_SSID='Freifunk'
+OFFLINE_PREFIX='FF_OFFLINE_' # Use something short to leave space for the nodename
 
 #Is there an active Gateway
 GATEWAY_TQ=`batctl gwl | grep "^=>" | cut -d" " -f3 | tr -d "()"`
-if [ $GATEWAY_TQ > 50 ];
+if [ $GATEWAY_TQ -gt 50 ];
 then
 	echo "Gateway TQ is $GATEWAY_TQ node is online"
 	for RADIO in $(iw dev | grep client | cut -d" " -f2); do
-		CURRENT_SSID=`iw dev $RADIO info | grep ssid | cut -d" " -f2`
-		# Use Freifunk for now, get it from /lib/gluon/site.conf in future version
-		if [ $CURRENT_SSID == 'Freifunk' ]
+		CURRENT_SSID=`iw dev $RADIO info | grep ssid | cut -d" " -f2` # Is there a better way to fetch the SSID wich is active?
+		if [ $CURRENT_SSID == $ONLINE_SSID ]
 		then
 			echo "SSID $CURRENT_SSID is correct, noting to do"
 		else
+			echo "SSID is $CURRENT_SSID, change to $ONLINE_SSID"
 			NUM=`echo $RADIO | tail -c 2`
-			`uci set wireless.client_radio$NUM.ssid="Freifunk"`
+			`uci set wireless.client_radio$NUM.ssid=$ONLINE_SSID`
 			wifi
 		fi
 	done
@@ -22,15 +27,20 @@ then
 else
 	echo "Gateway TQ is $GATEWAY_TQ node is considered offline"
 	NODENAME=`uname -n`
-	#There is a limit auf 32 charakters for the ssid + 'FF_OFFLINE_' leves us 21 maximum SSID length
-	if [ ${#NODENAME} > 20 ] ; then
-			OFFLINE_SSID=`echo "FF_OFFLINE_${STRING:0:9}...${STRING:(-9)}"` # use the first and last part of the nodename for nodes with long prefix
+	if [ ${#NODENAME} > 30-${#OFFLINE_PREFIX} ] ; then #32 would be possible as well
+		HALF=$(( (28 - ${#OFFLINE_PREFIX} ) / 2 ))
+		SKIP=$(( ${#NODENAME} - $HALF ))
+		OFFLINE_SSID=$OFFLINE_PREFIX${NODENAME:0:$HALF}...${NODENAME:$SKIP:${#NODENAME}} # use the first and last part of the nodename for nodes with long name
+		else
+			OFFLINE_SSID=`$OFFLINE_PREFIX$NODENAME`
+		fi
 	for RADIO in $(iw dev | grep client | cut -d" " -f2); do
 		CURRENT_SSID=`iw dev $RADIO info | grep ssid | cut -d" " -f2`
 		if [ $CURRENT_SSID == $OFFLINE_SSID ]
 		then
 			echo "SSID $CURRENT_SSID is correct, noting to do"
 		else
+			echo "SSID is $CURRENT_SSID, change to $OFFLINE_SSID"
 			NUM=`echo $RADIO | tail -c 2`
 			`uci set wireless.client_radio$NUM.ssid="$OFFLINE_SSID"`
 			wifi
@@ -38,4 +48,3 @@ else
 
 	done
 fi
-