diff --git a/actions/apache b/actions/apache
index 141f4753d..46ad82c84 100755
--- a/actions/apache
+++ b/actions/apache
@@ -133,10 +133,12 @@ def subcommand_setup(arguments):
         # enable mod_headers for HSTS
         webserver.enable('headers', kind='module')
 
+        # Various modules for authentication/authorization
+        webserver.enable('authnz_ldap', kind='module')
+
         # enable some critical modules to avoid restart while installing
         # FreedomBox applications.
         webserver.enable('cgi', kind='module')
-        webserver.enable('authnz_ldap', kind='module')
         webserver.enable('proxy_uwsgi', kind='module')
         webserver.enable('proxy_wstunnel', kind='module')
 
diff --git a/actions/ikiwiki b/actions/ikiwiki
index 764322265..6d8e8bad6 100755
--- a/actions/ikiwiki
+++ b/actions/ikiwiki
@@ -140,8 +140,6 @@ def setup():
         os.makedirs(SITE_PATH)
 
     with action_utils.WebserverChange() as webserver_change:
-        webserver_change.enable('cgi', kind='module')
-        webserver_change.enable('authnz_ldap', kind='module')
         webserver_change.enable('ikiwiki-plinth')