diff --git a/modules/installed/apps/apps.py b/modules/installed/apps/apps.py
index d6ba9d662..2706110ce 100644
--- a/modules/installed/apps/apps.py
+++ b/modules/installed/apps/apps.py
@@ -68,7 +68,7 @@ some other websites business model.</p>
         main="""
 """
         form = Form(title="Configuration", 
-                        action="/apps/owncloud", 
+                        action=cfg.server_dir + "/apps/owncloud", 
                         name="configure_owncloud",
                         message='')
         form.checkbox(_("Enable Owncloud"), name="owncloud_enable", id="owncloud_enable", checked=checkedinfo['enable'])
diff --git a/modules/installed/router/router.py b/modules/installed/router/router.py
index e38f5c575..278309f7b 100644
--- a/modules/installed/router/router.py
+++ b/modules/installed/router/router.py
@@ -138,7 +138,7 @@ class wan(FormPlugin, PagePlugin):
                     exec("if not '%(k)s' in kwargs: store['%(k)s'] = kwargs['%(k)s'] = %(c)s" % {'k':k, 'c':c})
 
         form = Form(title="WAN Connection", 
-                        action="/router/setup/wan/index", 
+                        action=cfg.server_dir + "/router/setup/wan/index", 
                         name="wan_connection_form",
                         message=message)
         form.dropdown('Connection Type', vals=["DHCP", "Static IP"], id="connect_type", onchange="hideshow_static()")
diff --git a/modules/installed/services/xmpp.py b/modules/installed/services/xmpp.py
index 6140cf1c5..8881a2bd0 100644
--- a/modules/installed/services/xmpp.py
+++ b/modules/installed/services/xmpp.py
@@ -43,7 +43,7 @@ class xmpp(PagePlugin):
 
         main = "<p>XMPP Server Configuration</p>"
         form = Form(title="Configuration",
-                    action="/services/xmpp",
+                    action=cfg.server_dir + "/services/xmpp",
                     name="configure_xmpp",
                     message='')
         form.checkbox(_("Allow In-Band Registration"), name="xmpp_inband_enable", 
@@ -66,7 +66,7 @@ class register(FormPlugin, PagePlugin):
 
     def main(self, username='', message=None, *args, **kwargs):
         form = Form(title="Register XMPP Account",
-                    action="/services/xmpp/register/index",
+                    action=cfg.server_dir + "/services/xmpp/register/index",
                     name="register_xmpp_form",
                     message=message)
         form.text_input(_("Username"), name="username", value=username)
diff --git a/modules/installed/system/config.py b/modules/installed/system/config.py
index d6b22467a..673eae852 100644
--- a/modules/installed/system/config.py
+++ b/modules/installed/system/config.py
@@ -108,7 +108,7 @@ class general(FormPlugin, PagePlugin):
 
         ## And now, the form.
         form = Form(title=_("General Config"),
-                        action="/sys/config/general/index",
+                        action=cfg.server_dir + "/sys/config/general/index",
                         name="config_general_form",
                         message=message )
         form.html(self.help())
diff --git a/modules/installed/system/expert_mode.py b/modules/installed/system/expert_mode.py
index e69e08bcf..dd6f11b49 100644
--- a/modules/installed/system/expert_mode.py
+++ b/modules/installed/system/expert_mode.py
@@ -47,7 +47,7 @@ class experts(FormPlugin, PagePlugin):
             expert = cfg.users.expert()
             cfg.log("Expert mode is %s" % expert)
         form = Form(title=_("Expert Mode"), 
-                        action="/sys/config/experts", 
+                        action=cfg.server_dir + "/sys/config/experts", 
                         name="expert_mode_form",
                         message=message )
         form.html(self.help())
diff --git a/modules/installed/system/users.py b/modules/installed/system/users.py
index 4277f1050..f83b0ae61 100644
--- a/modules/installed/system/users.py
+++ b/modules/installed/system/users.py
@@ -33,7 +33,7 @@ class add(FormPlugin, PagePlugin):
 
     def main(self, username='', name='', email='', message=None, *args, **kwargs):
         form = Form(title="Add User", 
-                        action="/sys/users/add/index", 
+                        action=cfg.server_dir + "/sys/users/add/index", 
                         onsubmit="return md5ify('add_user_form', 'password')", 
                         name="add_user_form",
                         message=message)
@@ -81,7 +81,7 @@ class edit(FormPlugin, PagePlugin):
 
     def main(self, msg=''):
         users = cfg.users.get_all()
-        add_form = Form(title=_("Edit or Delete User"), action="/sys/users/edit", message=msg)
+        add_form = Form(title=_("Edit or Delete User"), action=cfg.server_dir + "/sys/users/edit", message=msg)
         add_form.html('<span class="indent"><strong>Delete</strong><br /></span>')
         for uname in users:
             user = User(uname[1])
diff --git a/modules/installed/system/wan.py b/modules/installed/system/wan.py
index 394f67d6e..55ce1ec1b 100644
--- a/modules/installed/system/wan.py
+++ b/modules/installed/system/wan.py
@@ -57,7 +57,7 @@ class wan(FormPlugin, PagePlugin):
                     exec("if not '%(k)s' in kwargs: store['%(k)s'] = kwargs['%(k)s'] = %(c)s" % {'k':k, 'c':c})
 
         form = Form(title=_("Accessing the %s" % cfg.box_name), 
-                        action="/sys/config/wan", 
+                        action=cfg.server_dir + "/sys/config/wan", 
                         name="admin_wan_form",
                         message=message )
         form.html(self.help())