diff --git a/contrib/password_tab/password_policy_password_tab.module b/contrib/password_tab/password_policy_password_tab.module
index 34a9cdd..d5bdb61 100644
--- a/contrib/password_tab/password_policy_password_tab.module
+++ b/contrib/password_tab/password_policy_password_tab.module
@@ -48,7 +48,7 @@ function password_policy_password_tab_admin_paths() {
  */
 function password_policy_password_tab_form_user_profile_form_alter(&$form, &$form_state) {
   if (isset($form['account']['current_pass_required_values']['#value']['pass'])) {
-    unset($form['account']['current_pass']);
+    $form['account']['current_pass']['#description'] = str_replace(' or <em class="placeholder">Password</em>', '', $form['account']['current_pass']['#description']);
     unset($form['account']['current_pass_required_values']['#value']['pass']);
   }
 
diff --git a/contrib/password_tab/password_policy_password_tab.pages.inc b/contrib/password_tab/password_policy_password_tab.pages.inc
index 5b450ab..4db386e 100644
--- a/contrib/password_tab/password_policy_password_tab.pages.inc
+++ b/contrib/password_tab/password_policy_password_tab.pages.inc
@@ -33,7 +33,7 @@ function password_policy_password_tab($form, &$form_state, $account) {
       $protected_values['mail'] = t('E-mail address');
       $protected_values['pass'] = t('Password');
       $request_new = l(t('Request new password'), 'user/password', array('attributes' => array('title' => t('Request new password via e-mail.'))));
-      $current_pass_description = t('Enter your current password to change the %mail or %pass. !request_new.', array('%mail' => $protected_values['mail'], '%pass' => $protected_values['pass'], '!request_new' => $request_new));
+      $current_pass_description = t('Enter your current password to change the %pass. !request_new.', array('%pass' => $protected_values['pass'], '!request_new' => $request_new));
     }
     // The user must enter their current password to change to a new one.
     if (isset($protected_values['pass'])){
diff --git a/password_policy.module b/password_policy.module
index ac6a031..5fa7b50 100644
--- a/password_policy.module
+++ b/password_policy.module
@@ -435,9 +435,7 @@ function password_policy_form_alter(&$form, $form_state, $form_id) {
       // Hide current password field if a password change was forced by this 
       // module.
       if (isset($account->force_password_change) && $account->force_password_change) {
-        unset($form['account']['current_pass_required_values']);
-        unset($form['account']['current_pass']);
-        $form['#validate'] = array_diff($form['#validate'], array('user_validate_current_pass'));
+        unset($form['account']['current_pass_required_values']['#value']['pass']);
       }
 
       // Force password change on user account.