diff --git a/gluon-config-mode-reboot-ffhh/files/lib/gluon/config-mode/reboot/0101-nopubkey.lua b/gluon-config-mode-reboot-ffhh/files/lib/gluon/config-mode/reboot/0101-nopubkey.lua
index 3aa2c85..169c532 100644
--- a/gluon-config-mode-reboot-ffhh/files/lib/gluon/config-mode/reboot/0101-nopubkey.lua
+++ b/gluon-config-mode-reboot-ffhh/files/lib/gluon/config-mode/reboot/0101-nopubkey.lua
@@ -4,18 +4,26 @@ local meshvpn_enabled = uci:get("fastd", "mesh_vpn", "enabled", "0")
 if meshvpn_enabled == "1" then
   return nil
 else
+  local gluon_luci = require 'gluon.luci'
   local i18n = require "luci.i18n"
   local site = require 'gluon.site_config'
   local sysconfig = require 'gluon.sysconfig'
 
-  local hostname = uci:get_first("system", "system", "hostname")
+  local pretty_hostname = require 'pretty_hostname'
+
+  local hostname = pretty_hostname.get(uci)
 
   local msg = [[<p>]] .. i18n.translate('gluon-config-mode:nopubkey') .. [[</p>]]
 
   return function ()
-           luci.template.render_string(msg, { hostname=hostname
-                                            , site=site
-                                            , sysconfig=sysconfig
-                                            })
-         end
+	luci.template.render_string(msg,
+		{
+			hostname=hostname,
+			site=site,
+			sysconfig=sysconfig,
+			escape = gluon_luci.escape,
+			urlescape = gluon_luci.urlescape,
+		}
+	)
+	end
 end