diff --git a/js/bef_select_all_none.js b/js/bef_select_all_none.js
index c2984dc..4a7f4e7 100644
--- a/js/bef_select_all_none.js
+++ b/js/bef_select_all_none.js
@@ -11,11 +11,11 @@
        */
       var selected = $('.form-checkboxes.bef-select-all-none:not(.bef-processed)');
       if (selected.length) {
-        var selAll = Drupal.t('Select All');
-        var selNone = Drupal.t('Select None');
 
         // Set up a prototype link and event handlers
-        var link = $('<a class="bef-toggle" href="#">' + selAll + '</a>')
+        var selAll = Drupal.t('Select All', {}, {context: "bef_selected_all_none"});
+        var selNone = Drupal.t('Select None', {}, {context: "bef_selected_all_none"});
+        var link = $('<a class="bef-toggle" href="#">' + selAll + '</a>');
         link.click(function (event) {
           // Don't actually follow the link...
           event.preventDefault();
@@ -61,13 +61,19 @@
         selected
           .addClass('bef-processed')
           .each(function (index) {
-            // Clone the link prototype and insert into the DOM
-            var newLink = link.clone(true);
 
-            newLink.insertBefore($(this));
+            var allChecked = $('input:checkbox:checked', this).length === $('input:checkbox', this).length;
+            // Clone the link prototype and insert into the DOM
+            var newLink = link
+              .clone(true)
+              .text(allChecked ? selNone : selAll)
+              .insertBefore($(this));
 
-            // If all checkboxes are already checked by default then switch to Select None
-            if ($('input:checkbox:checked', this).length == $('input:checkbox', this).length) {
+            // If all checkboxes are already checked by default then switch to
+            // "Select None". This breaks thing if auto submit is enabled, thus
+            // don't do this if it is enabled.
+            var auto_submit_selectors = 'form[data-bef-auto-submit-full-form], [data-bef-auto-submit-full-form] form, [data-bef-auto-submit]';
+            if (allChecked && !$(auto_submit_selectors).length) {
               newLink.click();
             }
           })