2 files changed, 11 insertions, 2 deletions
diff --git a/client/components/main/layouts.jade b/client/components/main/layouts.jade
index b2c23920..55ee2686 100644
--- a/client/components/main/layouts.jade
+++ b/client/components/main/layouts.jade
@@ -38,9 +38,9 @@ template(name="userFormsLayout")
 template(name="defaultLayout")
   +header
   #content
-    | {{{currentSetting.customHTMLafterBodyStart}}}
+    | {{{afterBodyStart}}}
     +Template.dynamic(template=content)
-    | {{{currentSetting.customHTMLbeforeBodyEnd}}}
+    | {{{beforeBodyEnd}}}
   if (Modal.isOpen)
     #modal
       .overlay
diff --git a/client/components/main/layouts.js b/client/components/main/layouts.js
index d4a9d6d1..a50d167e 100644
--- a/client/components/main/layouts.js
+++ b/client/components/main/layouts.js
@@ -42,6 +42,15 @@ Template.userFormsLayout.helpers({
     return Settings.findOne();
   },
 
+
+  afterBodyStart() {
+    return currentSetting.customHTMLafterBodyStart;
+  },
+
+  beforeBodyEnd() {
+    return currentSetting.customHTMLbeforeBodyEnd;
+  },
+
   languages() {
     return _.map(TAPi18n.getLanguages(), (lang, code) => {
       const tag = code;