diff --git a/src/config b/src/config
index 3cad4ef..2d9b258 100644
--- a/src/config
+++ b/src/config
@@ -1,4 +1,4 @@
 export DIST_NAME=V1Pi
 export DIST_VERSION=0.16.0
 export BASE_IMAGE_ENLARGEROOT=800
-export MODULES="base(raspicam, network, nodejs, raspap, disable-services(octopi, cncjs), password-for-sudo)"
+export MODULES="base(raspicam, network, nodejs, disable-services(octopi, cncjs), raspap, password-for-sudo)"
diff --git a/src/modules/raspap/start_chroot_script b/src/modules/raspap/start_chroot_script
index d9411be..4d2efe9 100644
--- a/src/modules/raspap/start_chroot_script
+++ b/src/modules/raspap/start_chroot_script
@@ -90,7 +90,7 @@ mv /var/www/html/config/dhcpcd.conf /etc/dhcpcd.conf
 mv /var/www/html/config/config.php /var/www/html/includes/
 
 sed -i 's@\(server.port\s*=\s*\)80@\18080@' /etc/lighttpd/lighttpd.conf
-sed -i 's@raspi-webgui@$RASPAP_HOTSPOT_NAME@' /etc/hostapd/hostapd.conf
+sed -i "s@raspi-webgui@$RASPAP_HOTSPOT_NAME@" /etc/hostapd/hostapd.conf
 
 echo "--- RaspAP PHP Optimization"
 sed -i -E 's/^session\.cookie_httponly\s*=\s*(0|([O|o]ff)|([F|f]alse)|([N|n]o))\s*$/session.cookie_httponly = 1/' /etc/php/7.1/cgi/php.ini