diff --git a/source/rpc_server/srv_samr_nt.c b/source/rpc_server/srv_samr_nt.c
index 5f1ef25..0056966 100644
--- a/source/rpc_server/srv_samr_nt.c
+++ b/source/rpc_server/srv_samr_nt.c
@@ -3435,7 +3435,7 @@ static BOOL set_user_info_pw(uint8 *pass, struct samu *pwd,
 	 * it is needed to make XP join LDAP correctly, without it the later
 	 * auth2 check can fail with PWD_MUST_CHANGE.
 	 */
-	if (level != 25) {
+	if (level != 25 && last_set_time) {
 		/*
 		 * restore last set time as this is an admin change, not a
 		 * user pw change