diff --git a/src/freedombone-controlpanel b/src/freedombone-controlpanel
index 3ef6949c..7b5fe4dc 100755
--- a/src/freedombone-controlpanel
+++ b/src/freedombone-controlpanel
@@ -1336,7 +1336,7 @@ Enter a static local IP address for this system.\n\nIt will typically be 192.168
     esac
 
     if ! grep -q 'iface eth0 inet static' /etc/network/interfaces; then
-        if [ "$NEW_STATIC_GATEWAY" && "$NEW_STATIC_IP" ]; then
+        if [[ "$NEW_STATIC_GATEWAY" == *"."* && "$NEW_STATIC_IP" == *"."* ]]; then
             echo '# This file describes the network interfaces available on your system' > /etc/network/interfaces
             echo '# and how to activate them. For more information, see interfaces(5).' >> /etc/network/interfaces
             echo '' >> /etc/network/interfaces