diff --git a/source/dsdb/common/util.c b/source/dsdb/common/util.c
index 07a433780b4..88c8afd6cca 100644
--- a/source/dsdb/common/util.c
+++ b/source/dsdb/common/util.c
@@ -517,7 +517,7 @@ NTTIME samdb_result_force_password_change(struct ldb_context *sam_ldb,
 
 	maxPwdAge = samdb_search_int64(sam_ldb, mem_ctx, 0, domain_dn, "maxPwdAge", NULL);
 	if (maxPwdAge == 0) {
-		return 0;
+		return 0x7FFFFFFFFFFFFFFFULL;
 	} else {
 		attr_time -= maxPwdAge;
 	}