diff --git a/views/subscription/partials/subscription-flash-messages.hbs b/views/subscription/partials/subscription-flash-messages.hbs
index f5561c5c..f66336ef 100644
--- a/views/subscription/partials/subscription-flash-messages.hbs
+++ b/views/subscription/partials/subscription-flash-messages.hbs
@@ -12,9 +12,3 @@
         {{#translate}}JavaScript must be enabled in order for this form to work{{/translate}}
     </div>
 {{/if}}
-
-<script>
-    document.querySelectorAll('.js-warning').forEach(function(el) {
-        el.style.display = 'none';
-    });
-</script>
diff --git a/views/subscription/partials/subscription-footer-scripts.hbs b/views/subscription/partials/subscription-footer-scripts.hbs
index f173a6cf..ebf8a948 100644
--- a/views/subscription/partials/subscription-footer-scripts.hbs
+++ b/views/subscription/partials/subscription-footer-scripts.hbs
@@ -1,41 +1,46 @@
 <script>
-    var btnBgColor = '{{btnBgColor}}';
-    var btnBgColorHover = '{{btnBgColorHover}}';
-
-    if (typeof moment !== 'undefined' && moment.tz) {
-        (function () {
-            var tz = moment.tz.guess();
-            if (tz) {
-                document.querySelectorAll('.tz-detect').forEach(function(el) {
-                    el.value = tz;
-                });
+    (function () {
+        var forEach = function (array, callback, scope) {
+            for (var i = 0; i < array.length; i++) {
+                callback.call(scope, i, array[i]);
             }
-        })();
-    }
-
-    document.querySelectorAll('a[href="#submit"]').forEach(function(a) {
-        a.onclick = function() {
-            var form = document.getElementById('main-form');
-            form && form.submit();
-            return false;
         };
-    });
 
-    // Fixes MJML Button until they do ...
-    // https://github.com/mjmlio/mjml/issues/359
+        forEach(document.querySelectorAll('.js-warning'), function(i, el) {
+            el.style.display = 'none';
+        });
 
-    if (window.btnBgColor) {
-        (function() {
+        forEach(document.querySelectorAll('a[href="#submit"]'), function(i, a) {
+            a.onclick = function() {
+                var form = document.getElementById('main-form');
+                form && form.submit();
+                return false;
+            };
+        });
+
+        if (typeof moment !== 'undefined' && moment.tz) {
+            forEach(document.querySelectorAll('.tz-detect'), function(i, el) {
+                el.value = moment.tz.guess() || '';
+            });
+        }
+
+        // Fixes MJML Button until they do ...
+        // https://github.com/mjmlio/mjml/issues/359
+
+        var btnBgColor = '{{btnBgColor}}';
+        var btnBgColorHover = '{{btnBgColorHover}}';
+
+        if (btnBgColor) {
             var s = document.createElement('style');
             var c = document.createTextNode(
-                '.td-btn:hover { background-color: ' + window.btnBgColorHover + '; }' +
+                '.td-btn:hover { background-color: ' + btnBgColorHover + '; }' +
                 '.td-btn { cursor: pointer !important; }' +
                 '.a-btn { background-color: transparent !important; }'
             );
             s.appendChild(c);
             document.getElementsByTagName('head')[0].appendChild(s);
-            document.querySelectorAll('a').forEach(function(a) {
-                if (a.parentNode.getAttribute('bgcolor') === window.btnBgColor) {
+            forEach(document.querySelectorAll('a'), function(i, a) {
+                if (a.parentNode.getAttribute('bgcolor') === btnBgColor) {
                     a.target = '_self';
                     a.className += 'a-btn';
                     a.parentNode.className += 'td-btn';
@@ -44,8 +49,8 @@
                     };
                 }
             });
-        })();
-    }
+        }
+    })();
 </script>
 
 <!-- custom scripts from config -->