diff --git a/app/assets/stylesheets/legacy.scss b/app/assets/stylesheets/legacy.scss
index dd9519eb..0bcefd58 100644
--- a/app/assets/stylesheets/legacy.scss
+++ b/app/assets/stylesheets/legacy.scss
@@ -428,6 +428,10 @@ a.footer_link {
         width: 250px;
     }
 
+    input[type="checkbox"] {
+        height: auto;
+    }
+
     /* override jquery css to match tracks defaults better */
     div.pref_new_token a { color: #CC3334; }
 }
diff --git a/app/helpers/preferences_helper.rb b/app/helpers/preferences_helper.rb
index b187b75a..e8cbafe9 100644
--- a/app/helpers/preferences_helper.rb
+++ b/app/helpers/preferences_helper.rb
@@ -1,11 +1,15 @@
 module PreferencesHelper
 
   def pref(model, pref_name, &block)
-    s = content_tag(:label, Preference.human_attribute_name(pref_name), :for => model+pref_name)
+    s = content_tag(:label, Preference.human_attribute_name(pref_name), :for => model + "_" + pref_name)
     s << yield
     s
   end
 
+  def pref_with_check_box_field(model, pref_name)
+    pref(model, pref_name) { check_box(model, pref_name, class: "form-control") }
+  end
+
   def pref_with_select_field(model, pref_name, collection = [ [t('preferences.is_true'),true], [t('preferences.is_false'), false] ])
     pref(model, pref_name) { select(model, pref_name, collection, {}, class: "form-control") }
   end
diff --git a/app/views/preferences/_tracks_behavior.html.erb b/app/views/preferences/_tracks_behavior.html.erb
index 1479f522..a4efd17d 100644
--- a/app/views/preferences/_tracks_behavior.html.erb
+++ b/app/views/preferences/_tracks_behavior.html.erb
@@ -27,7 +27,7 @@
   <%= pref_with_text_field('prefs', 'refresh') %>
 </div>
 <div class="form-group">
-  <%= pref_with_select_field('prefs', "verbose_action_descriptors") %>
+  <%= pref_with_check_box_field('prefs', "verbose_action_descriptors") %>
 </div>
 <div class="form-group">
   <%= pref_with_text_field('prefs', "mobile_todos_per_page") %>
diff --git a/app/views/users/_update_password.html.erb b/app/views/users/_update_password.html.erb
index 5f2fa683..5eb486bd 100644
--- a/app/views/users/_update_password.html.erb
+++ b/app/views/users/_update_password.html.erb
@@ -1,8 +1,8 @@
 <div class="form-group">
   <label for="user[password]"><%= t('users.new_password_label') %>:</label>
-  <%= password_field "user", "password", :size => 40, :autocomplete => "off", class: "form-control" %>
+  <%= password_field "user", "password", :size => 40, :autocomplete => "new-password", class: "form-control" %>
 </div>
 <div class="form-group">
   <label for="user[password_confirmation]"><%= t('users.password_confirmation_label') %>:</label>
-  <%= password_field "user", "password_confirmation", :size => 40, :autocomplete => "off", class: "form-control" %>
+  <%= password_field "user", "password_confirmation", :size => 40, :autocomplete => "new-password", class: "form-control" %>
 </div>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 8efccb29..1a545da1 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -61,7 +61,7 @@ en:
         date_format: Date format
         show_hidden_contexts_in_sidebar: Show hidden contexts in sidebar
         mobile_todos_per_page: Actions per page (Mobile View)
-        verbose_action_descriptors: Verbose action descriptors
+        verbose_action_descriptors: Show descriptors (context, project) of actions in a verbose form
         staleness_starts: Start of staleness
         review_period: Project review interval
         sms_context: Default email context