diff --git a/installation/routines/customize_options.sh b/installation/routines/customize_options.sh
index 7dbccb2c2..64d5b44cf 100644
--- a/installation/routines/customize_options.sh
+++ b/installation/routines/customize_options.sh
@@ -72,6 +72,11 @@ Do you want to enable an Autohotspot? [y/N]"
     esac
 
     if [ "$ENABLE_AUTOHOTSPOT" = true ]; then
+        #add hostname to default SSID to prevent collision
+        local local_hostname=$(hostname)
+        AUTOHOTSPOT_SSID="${AUTOHOTSPOT_SSID}_${local_hostname}"
+        AUTOHOTSPOT_SSID="${AUTOHOTSPOT_SSID:0:32}"
+
         local response_autohotspot
         while [[ $response_autohotspot != "n" ]]
         do