diff --git a/module/execution/css/kanban.css b/module/execution/css/kanban.css
index a987329020..0463eec1ed 100644
--- a/module/execution/css/kanban.css
+++ b/module/execution/css/kanban.css
@@ -106,5 +106,5 @@
 
 #mainMenu .divider {margin: 10px}
 
-.kanbanRegion {margin: 5px}
-.modal-header {padding: 15px 0;}
+.kanbanRegion  {margin: 5px}
+.modal-header  {padding: 15px 0;}
diff --git a/module/execution/view/importbug.html.php b/module/execution/view/importbug.html.php
index 2e6e2fbeff..0a1a030c45 100755
--- a/module/execution/view/importbug.html.php
+++ b/module/execution/view/importbug.html.php
@@ -75,7 +75,7 @@
       </div>
       <div class='btn-toolbar'>
         <?php if(isonlybody()):?>
-        <?php echo html::commonButton('<i class="icon icon-back icon-sm"></i> ' . $lang->goback, 'onclick="goback()"', 'btn');?>
+        <?php echo html::submitButton('<i class="icon icon-back icon-sm"></i> ' . $lang->goback, 'onclick="goback()"', 'btn');?>
         <?php else:?>
         <?php echo html::backButton('','','btn');?>
         <?php endif;?>
diff --git a/module/user/js/create.js b/module/user/js/create.js
index bf415c8610..11375a9b0a 100644
--- a/module/user/js/create.js
+++ b/module/user/js/create.js
@@ -68,17 +68,20 @@ $(function()
     $('#password2').change(function(){password2Encrypted = false});
     $('#submit').click(function()
     {
-        var password1        = $('#password1').val();
-        var password2        = $('#password2').val();
-        var passwordStrength = computePasswordStrength(password1);
+        if(!password1Encrypted && !password2Encrypted)
+        {
+            var password1        = $('#password1').val();
+            var password2        = $('#password2').val();
+            var passwordStrength = computePasswordStrength(password1);
 
-        if($("form input[name=passwordStrength]").length == 0) $('#submit').after("<input type='hidden' name='passwordStrength' value='0' />");
-        $("form input[name=passwordStrength]").val(passwordStrength);
+            if($("form input[name=passwordStrength]").length == 0) $('#submit').after("<input type='hidden' name='passwordStrength' value='0' />");
+            $("form input[name=passwordStrength]").val(passwordStrength);
 
-        var rand      = $('input#verifyRand').val();
-        if(password1 && !password1Encrypted) $('#password1').val(md5(password1) + rand);
-        if(password2 && !password2Encrypted) $('#password2').val(md5(password2) + rand);
-        password1Encrypted = true;
-        password2Encrypted = true;
+            var rand      = $('input#verifyRand').val();
+            if(password1 && !password1Encrypted) $('#password1').val(md5(password1) + rand);
+            if(password2 && !password2Encrypted) $('#password2').val(md5(password2) + rand);
+            password1Encrypted = true;
+            password2Encrypted = true;
+        }
     })
 });