diff --git a/public/templates/bootstrap/master.tpl b/public/templates/bootstrap/master.tpl
index a147cbc6..41e026cc 100644
--- a/public/templates/bootstrap/master.tpl
+++ b/public/templates/bootstrap/master.tpl
@@ -11,10 +11,6 @@
   <![endif]-->
 
   <!--[if IE]><script type="text/javascript" src="{$PATH}/js/excanvas.js"></script><![endif]-->
-  {literal}<script>
-    var zxcvbnPath = "{/literal}{$PATH}{literal}/js/zxcvbn/zxcvbn.js";
-  </script>{/literal}
-  <script type="text/javascript" src="{$PATH}/js/pwcheck.js"></script>
   {if $GLOBAL.statistics.analytics.enabled}
   {$GLOBAL.statistics.analytics.code nofilter}
   {/if}
diff --git a/public/templates/bootstrap/register/default.tpl b/public/templates/bootstrap/register/default.tpl
index 4eba2514..2db8231b 100644
--- a/public/templates/bootstrap/register/default.tpl
+++ b/public/templates/bootstrap/register/default.tpl
@@ -1,3 +1,8 @@
+<script>
+  var zxcvbnPath = "{$PATH}/js/zxcvbn/zxcvbn.js";
+</script>
+<script type="text/javascript" src="{$PATH}/js/pwcheck.js"></script>
+
 <div class="row">
   <div class="col-lg-6">
     <div class="panel panel-info">
@@ -18,10 +23,10 @@
             </div>
             <div class="form-group">
               <label>Password</label>
-              <p style="padding-right:10px;display:block;margin-top:0px;float:right;color:#999;" id="pw_strength">Strength</p>
+              <span style="padding-right:10px;display:block;margin-top:1px;float:right;color:#999;" id="pw_strength">Strength</span>
               <input type="password" class="form-control" name="password1" value="" size="15" maxlength="100" id="pw_field" required>
               <label>Repeat Password</label>
-              <p style="padding-right:10px;display:block;margin-top:0px;float:right;" id="pw_match"></p>
+              <span style="padding-right:10px;display:block;margin-top:1px;float:right;" id="pw_match"></span>
               <input type="password" class="form-control" name="password2" value="" size="15" maxlength="100" id="pw_field2" required>
             </div>
             <div class="form-group">