diff --git a/modules/installed/system/system.py b/modules/installed/system/system.py
index 758f5eff1..89c6aa0f8 100644
--- a/modules/installed/system/system.py
+++ b/modules/installed/system/system.py
@@ -18,10 +18,5 @@ class Sys(PagePlugin):
 
     @cherrypy.expose
     def index(self):
-        return util.render_template(title=_("System Configuration"), main=_("""
-        <p>In this section, you can control the %(product)s's
-        underlying system, as opposed to its various applications and
-        services.  These options affect the %(product)s at its most
-        general level.  This is where you add/remove users, install
-        applications, reboot, etc.</p>
-        """ % {'product':cfg.product_name}))
+        return util.render_template(template='system',
+                                    title=_("System Configuration"))
diff --git a/modules/installed/system/templates/system.html b/modules/installed/system/templates/system.html
new file mode 100644
index 000000000..d248627e4
--- /dev/null
+++ b/modules/installed/system/templates/system.html
@@ -0,0 +1,11 @@
+{% extends 'login_nav.html' %}
+
+{% block main_block %}
+
+<p>In this section, you can control the {{ cfg.product_name }}'s
+underlying system, as opposed to its various applications and
+services.  These options affect the {{ cfg.product_name }} at its most
+general level.  This is where you add/remove users, install
+applications, reboot, etc.</p>
+
+{% endblock %}