diff --git a/password_policy.module b/password_policy.module
index 1bcb2fd..70980d1 100644
--- a/password_policy.module
+++ b/password_policy.module
@@ -570,8 +570,8 @@ function password_policy_form_alter(&$form, $form_state, $form_id) {
       // module.
       if (isset($account->force_password_change) && $account->force_password_change) {
         unset($form['account']['current_pass']);
-        unset($form['account']['current_pass_required_values']['#value']['mail']);
-        unset($form['account']['current_pass_required_values']['#value']['pass']);
+        unset($form['current_pass_required_values']['#value']['mail']);
+        unset($form['current_pass_required_values']['#value']['pass']);
       }
 
       // Force password change on user account.