diff --git a/install.sh b/install.sh
index 0f07db7..c16fe74 100755
--- a/install.sh
+++ b/install.sh
@@ -15,14 +15,14 @@ echo "The Things Network Gateway installer"
 echo "Version $VERSION"
 
 # Retrieve gateway configuration for later
-echo "Configure your gateway:"
-printf "       Descriptive name [ttn-ic880a]:"
-read GATEWAY_NAME
+echo "Configuring gateway:"
+
 if [ $GATEWAY_NAME == "" ];
 then
-    echo "ERROR: NO GATEWAY SPECIFIED"
+    echo "ERROR: NO GATEWAY_NAME FOUND IN ENVIRONMENT"
     exit 1
 fi
+echo GATEWAY_NAME: $GATEWAY_NAME
 
 printf "       Contact email: "
 read GATEWAY_EMAIL
diff --git a/install.sh~ b/install.sh~
index c71d6ce..0f07db7 100755
--- a/install.sh~
+++ b/install.sh~
@@ -18,7 +18,11 @@ echo "Version $VERSION"
 echo "Configure your gateway:"
 printf "       Descriptive name [ttn-ic880a]:"
 read GATEWAY_NAME
-if [[ $GATEWAY_NAME == "" ]]; then GATEWAY_NAME="ttn-ic880a"; fi
+if [ $GATEWAY_NAME == "" ];
+then
+    echo "ERROR: NO GATEWAY SPECIFIED"
+    exit 1
+fi
 
 printf "       Contact email: "
 read GATEWAY_EMAIL