diff --git a/ckan/templates/user/edit_user_form.html b/ckan/templates/user/edit_user_form.html
index b11ae5b364c..d0141f5f397 100644
--- a/ckan/templates/user/edit_user_form.html
+++ b/ckan/templates/user/edit_user_form.html
@@ -27,7 +27,7 @@
     {{ form.input('old_password',
                   type='password',
                   label=_('Sysadmin Password') if is_sysadmin else _('Old Password'),
-                  id='field-password',
+                  id='field-password-old',
                   value=data.oldpassword,
                   error=errors.oldpassword,
                   classes=['control-medium'],
diff --git a/ckan/templates/user/read_base.html b/ckan/templates/user/read_base.html
index e78e1812a70..e76053b505b 100644
--- a/ckan/templates/user/read_base.html
+++ b/ckan/templates/user/read_base.html
@@ -79,7 +79,7 @@ <h1 class="heading">{{ user.display_name }}</h1>
         </dl>
         {% if is_myself %}
           <dl>
-            <dt>{{ _('Email') }} <span class="label" title="{{ _('This means only you can see this') }}">{{ _('Private') }}</span></dt>
+            <dt>{{ _('Email') }} <span class="label label-default" title="{{ _('This means only you can see this') }}">{{ _('Private') }}</span></dt>
             <dd>{{ user.email }}</dd>
           </dl>
         {% endif %}