diff --git a/package/gluon-config-mode/files/usr/lib/lua/luci/controller/gluon-config-mode/index.lua b/package/gluon-config-mode/files/usr/lib/lua/luci/controller/gluon-config-mode/index.lua
index 8803dde67fd2dd9f4bb870b080f4c29e8a5a79a8..731ed73b473fe1d8981cb990504223f58f959010 100644
--- a/package/gluon-config-mode/files/usr/lib/lua/luci/controller/gluon-config-mode/index.lua
+++ b/package/gluon-config-mode/files/usr/lib/lua/luci/controller/gluon-config-mode/index.lua
@@ -64,7 +64,7 @@ function action_reboot()
 
   if nixio.fork() ~= 0 then
     luci.template.render("gluon-config-mode/reboot",
-      {pubkey=pubkey, hostname=hostname, site=site})
+      {luci=luci, pubkey=pubkey, hostname=hostname, site=site})
   else
     debug.setfenv(io.stdout, debug.getfenv(io.open '/dev/null'))
     io.stdout:close()
diff --git a/package/gluon-config-mode/files/usr/lib/lua/luci/view/gluon-config-mode/cbi/wizard.htm b/package/gluon-config-mode/files/usr/lib/lua/luci/view/gluon-config-mode/cbi/wizard.htm
index db5fe8b09d56979e54483c305ec2306632bfd637..cadfb0069a253b7f499e7fc3df6a43bb73642850 100644
--- a/package/gluon-config-mode/files/usr/lib/lua/luci/view/gluon-config-mode/cbi/wizard.htm
+++ b/package/gluon-config-mode/files/usr/lib/lua/luci/view/gluon-config-mode/cbi/wizard.htm
@@ -1,10 +1,12 @@
 <%-
 	local site = require 'gluon.site_config'
+	local sysconfig = require 'gluon.sysconfig'
+	local template = require 'luci.template'
 -%>
 
 <h2>Willkommen!</h2>
 <p>
-	<%= site.config_mode.msg_welcome %>
+	<%= template.render_string(site.config_mode.msg_welcome, {hostname=hostname, sysconfig=sysconfig}) %>
 </p>
 
 <% if not self.embedded then %>
diff --git a/package/gluon-config-mode/files/usr/lib/lua/luci/view/gluon-config-mode/reboot.htm b/package/gluon-config-mode/files/usr/lib/lua/luci/view/gluon-config-mode/reboot.htm
index 238da2753da4a714a2304cf2dd60d9b5776bc385..db9cbc2313be6be21e137ebb8cfff85c32ec72e6 100644
--- a/package/gluon-config-mode/files/usr/lib/lua/luci/view/gluon-config-mode/reboot.htm
+++ b/package/gluon-config-mode/files/usr/lib/lua/luci/view/gluon-config-mode/reboot.htm
@@ -13,17 +13,17 @@
         <% if pubkey then %>
         <fieldset class="cbi-section">
           <p>
-            <%= site.config_mode.msg_pubkey %>
+            <%= luci.template.render_string(site.config_mode.msg_pubkey) %>
           </p>
           <div class="the-key">
-            # Hostname: <%= hostname %>
+            # <%= hostname %>
             <br/>
             <%= pubkey %>
           </div>
         </fieldset>
         <% end %>
         <fieldset class="cbi-section">
-          <%= site.config_mode.msg_reboot %>
+          <%= luci.template.render_string(site.config_mode.msg_reboot) %>
         </fieldset>
       </div>
     </div>