diff --git a/kpasswd/kpasswdd.c b/kpasswd/kpasswdd.c
index 4d8ec845e..981ce3419 100644
--- a/kpasswd/kpasswdd.c
+++ b/kpasswd/kpasswdd.c
@@ -299,6 +299,8 @@ change (krb5_auth_context auth_context,
 	    free (ent.modified_by);
 	}
 	ent.modified_by = e;
+	if (ent.pw_end)
+	    *ent.pw_end = e->time + 3600; /* XXX - Change here! */
 	ret = db->store (context, db, &ent);
     }
     krb5_free_keyblock (context, &new_keyblock);