diff --git a/themes/bootstrap/js/common.js b/themes/bootstrap/js/common.js
index 026990ccbc97ed783970792b86b3104dcf847438..77818460e004510aa650dce2f9d938e82c165e0e 100644
--- a/themes/bootstrap/js/common.js
+++ b/themes/bootstrap/js/common.js
@@ -10,6 +10,7 @@ function htmlEncode(value){
 }
 function extractClassParams(str) {
   str = $(str).attr('class');
+  if (typeof str === "undefined") return [];
   var params = {};
   var classes = str.split(/\s+/);
   for(var i = 0; i < classes.length; i++) {
@@ -229,7 +230,8 @@ function ajaxLogin(form) {
             if (response.status == 'OK') {
               updatePageForLogin();
               // and we update the modal
-              if(Lightbox.lastPOST && Lightbox.lastPOST['loggingin']) {
+              var params = deparam(Lightbox.lastURL);
+              if (params['subaction'] == 'UserLogin') {
                 Lightbox.close();
               } else {
                 Lightbox.getByUrl(
@@ -388,7 +390,7 @@ $(document).ready(function() {
   });
   Lightbox.addFormCallback('accountForm', function() {
     var params = deparam(Lightbox.openingURL);
-    if (params['subaction'] != 'Login') {
+    if (params['subaction'] != 'UserLogin') {
       Lightbox.getByUrl(Lightbox.openingURL);
       Lightbox.openingURL = false;
     } else {
@@ -409,7 +411,7 @@ $(document).ready(function() {
   });
   // Login link
   $('#loginOptions a.modal-link').click(function() {
-    return Lightbox.get('MyResearch','UserLogin',{},{'loggingin':true});
+    return Lightbox.get('MyResearch','UserLogin');
   });
   // Email search link
   $('.mailSearch').click(function() {
diff --git a/themes/bootstrap/js/record.js b/themes/bootstrap/js/record.js
index 1e358ed3bd893afbb2ed3bbcd6fce7496aa1a8b2..a89c08a8488f83fea3b8788daf0182afcca1241f 100644
--- a/themes/bootstrap/js/record.js
+++ b/themes/bootstrap/js/record.js
@@ -116,7 +116,6 @@ function registerAjaxCommentRecord() {
           refreshCommentList(id, recordSource);
           $(form).find('textarea[name="comment"]').val('');
         } else if (response.status == 'NEED_AUTH') {
-          data['loggingin'] = true;
           Lightbox.addCloseAction(function() {
             $.ajax({
               type: 'POST',