diff --git a/install-freedombone.sh b/install-freedombone.sh
index 3c603523..c410a4f4 100755
--- a/install-freedombone.sh
+++ b/install-freedombone.sh
@@ -7155,11 +7155,13 @@ function enable_wifi_hotspot {
 
   # Create an ESSID if one doesn't exist
   if [ ! $WIFI_ESSID ]; then
-      WIFI_ESSID="Freedom"$(openssl rand -base64 4)
+      TEMP_WIFI_ESSID="Freedom"$(openssl rand -base64 8)
+      WIFI_ESSID=${$TEMP_WIFI_ESSID:0:3}
   fi
   # Add a password
   if [ ! $WIFI_PASSWORD ]; then
-      WIFI_PASSWORD=$(openssl rand -base64 8)
+      TEMP_WIFI_PASSWORD=$(openssl rand -base64 8)
+      WIFI_PASSWORD=$($TEMP_WIFI_PASSWORD:0:8}
   fi
 
   sed -i 's|#DAEMON_CONF=.*|DAEMON_CONF="/etc/hostapd/hostapd.conf"|g' /etc/default/hostapd
@@ -7261,9 +7263,15 @@ function enable_wifi {
 
   # Create an ESSID if one doesn't exist
   if [ ! $WIFI_ESSID ]; then
-      WIFI_ESSID="Freedom"$(openssl rand -base64 4)
+      TEMP_WIFI_ESSID="Freedom"$(openssl rand -base64 8)
+      WIFI_ESSID=${$TEMP_WIFI_ESSID:0:3}
   fi
   sed -i "s/essid/$WIFI_ESSID/g" /etc/network/interfaces
+  # Add a password
+  if [ ! $WIFI_PASSWORD ]; then
+      TEMP_WIFI_PASSWORD=$(openssl rand -base64 8)
+      WIFI_PASSWORD=$($TEMP_WIFI_PASSWORD:0:8}
+  fi
 
   # Add a password
   if [ $WIFI_PASSWORD ]; then