diff --git a/freepbx/entrypoint.sh b/freepbx/entrypoint.sh
index cb2ff307c..89fc8450c 100755
--- a/freepbx/entrypoint.sh
+++ b/freepbx/entrypoint.sh
@@ -91,12 +91,6 @@ chown asterisk:asterisk /var/lib/asterisk/db
 # Setup ca bundle for pjsip
 ln -sf /etc/pki/tls/certs/ca-bundle.crt /etc/ssl/certs/ca-certificates.crt
 
-
-# Customized wizard page
-cat > /etc/apache2/sites-available/wizard.conf <<EOF
-Alias / /var/www/html/freepbx/wizard
-EOF
-
 # Link rewrite configuration
 if [[ ! -f /etc/apache2/sites-enabled/wizard.conf ]] ; then
 	ln -sf /etc/apache2/sites-available/wizard.conf /etc/apache2/sites-enabled/wizard.conf
diff --git a/freepbx/etc/apache2/sites-enabled/000-default.conf b/freepbx/etc/apache2/sites-enabled/000-default.conf
index 7a5c7de21..d8b0b1e9c 100644
--- a/freepbx/etc/apache2/sites-enabled/000-default.conf
+++ b/freepbx/etc/apache2/sites-enabled/000-default.conf
@@ -1,4 +1,8 @@
 <VirtualHost *:80>
+	<LocationMatch "^/$">
+		Redirect 301 "%{HTTP:X-Forwarded-Proto}://%{HTTP:X-Forwarded-Host}/freepbx/wizard/
+	</LocationMatch>
+
 	<LocationMatch "^/freepbx/?$">
 		Redirect 301 "%{HTTP:X-Forwarded-Proto}://%{HTTP:X-Forwarded-Host}/freepbx/admin/
 	</LocationMatch>