diff --git a/themes/bootstrap/js/cart.js b/themes/bootstrap/js/cart.js
index f5149c11b1d28ca06419378fa4f2cf991b06c0fb..dd21ac7d1154efa3866cd8d3fbdccb35e56a1ee9 100644
--- a/themes/bootstrap/js/cart.js
+++ b/themes/bootstrap/js/cart.js
@@ -171,7 +171,7 @@ function cartSubmit($form) {
     }
     document.location.href = url;
   } else if ((submit != 'empty' || confirm(vufindString['confirmEmpty']))
-  && (submit != 'delete' || confirm(vufindString['confirmDelete']))) {
+         && (submit != 'delete' || confirm(vufindString['confirmDelete']))) {
     Lightbox.submit($form, Lightbox.changeContent);
   } else {
     $('#modal').find('.icon-spinner').remove();
diff --git a/themes/bootstrap/js/common.js b/themes/bootstrap/js/common.js
index 9e0b893a258193472efe134ad06fc94828244af1..d8ed57c733466de64de2acd55e91f4ace55801c9 100644
--- a/themes/bootstrap/js/common.js
+++ b/themes/bootstrap/js/common.js
@@ -124,6 +124,8 @@ function registerLightboxEvents() {
   $(modal).find("form input[type=submit]").click(function() {
     // Abort requests triggered by the lightbox
     $('#modal .icon-spinner').remove();
+    // Remove other clicks
+    $(modal).find('input[type="submit"][clicked=true]').attr('clicked', false);
     // Add useful information
     $(this).attr("clicked", "true");
     // Add prettiness
@@ -214,8 +216,9 @@ function ajaxLogin(form) {
         // get the user entered password
         var password = form.password.value;
 
-        // encrypt the password with the salt
-        password = rc4Encrypt(salt, password);
+        // base-64 encode the password (to allow support for Unicode)
+        // and then encrypt the password with the salt
+        password = rc4Encrypt(salt, btoa(unescape(encodeURIComponent(password))));
 
         // hex encode the encrypted password
         password = hexEncode(password);
@@ -349,7 +352,6 @@ $(document).ready(function() {
       }, 500); // Delay request submission
     },
     updater : function(item) { // Submit on update
-      // console.log(this.$element[0].form.submit);
       this.$element[0].value = item;
       this.$element[0].form.submit();
       return item;
diff --git a/themes/bootstrap3/js/cart.js b/themes/bootstrap3/js/cart.js
index 0b53236b774de3faecfc0c44dc7a5155aefe25bf..3843c8c3213823261d8c80db925058f59b300f6a 100644
--- a/themes/bootstrap3/js/cart.js
+++ b/themes/bootstrap3/js/cart.js
@@ -171,7 +171,7 @@ function cartSubmit($form) {
     }
     document.location.href = url;
   } else if ((submit != 'empty' || confirm(vufindString['confirmEmpty']))
-  && (submit != 'delete' || confirm(vufindString['confirmDelete']))) {
+         && (submit != 'delete' || confirm(vufindString['confirmDelete']))) {
     Lightbox.submit($form, Lightbox.changeContent);
   } else {
     $('#modal').find('.fa.fa-spinner').remove();
diff --git a/themes/bootstrap3/js/common.js b/themes/bootstrap3/js/common.js
index 56273cf3d41e8ce85d58b125e75c399203e0a8f4..1bba79911b76fb994a2bfce1996c1b50ab9eec85 100644
--- a/themes/bootstrap3/js/common.js
+++ b/themes/bootstrap3/js/common.js
@@ -126,6 +126,8 @@ function registerLightboxEvents() {
   $(modal).find("form input[type=submit]").click(function() {
     // Abort requests triggered by the lightbox
     $('#modal .fa-spinner').remove();
+    // Remove other clicks
+    $(modal).find('input[type="submit"][clicked=true]').attr('clicked', false);
     // Add useful information
     $(this).attr("clicked", "true");
     // Add prettiness