diff --git a/password_policy.module b/password_policy.module
index b7d1c3f..288e476 100644
--- a/password_policy.module
+++ b/password_policy.module
@@ -283,7 +283,7 @@ function password_policy_user_insert(&$edit, $account, $category) {
 function password_policy_user_update(&$edit, $account, $category) {
   global $user;
 
-  if ($account->force_password_change) {
+  if (isset($account->force_password_change) && $account->force_password_change) {
     db_update('password_policy_force_change')
       ->fields(array(
         'force_change' => 0,