diff --git a/SeedDMS_Core/Core/inc.ClassUser.php b/SeedDMS_Core/Core/inc.ClassUser.php
index 87e951d82..6fce7d18f 100644
--- a/SeedDMS_Core/Core/inc.ClassUser.php
+++ b/SeedDMS_Core/Core/inc.ClassUser.php
@@ -268,11 +268,13 @@ class SeedDMS_Core_User { /* {{{ */
 	function setPwdExpiration($newPwdExpiration) { /* {{{ */
 		$db = $this->_dms->getDB();
 
-		if(trim($newPwdExpiration) == '' || trim($newPwdExpiration) == 'never')
-			$newPwdExpiration = '0000-00-00 00:00:00';
-		elseif(trim($newPwdExpiration) == 'now')
-			$newPwdExpiration = date('Y-m-d H:i:s');
-		$queryStr = "UPDATE `tblUsers` SET `pwdExpiration` =".$db->qstr($newPwdExpiration)." WHERE `id` = " . $this->_id;
+		if(trim($newPwdExpiration) == '' || trim($newPwdExpiration) == 'never') {
+			$queryStr = "UPDATE `tblUsers` SET `pwdExpiration` = NULL WHERE `id` = " . $this->_id;
+		} else {
+			if(trim($newPwdExpiration) == 'now')
+				$newPwdExpiration = date('Y-m-d H:i:s');
+			$queryStr = "UPDATE `tblUsers` SET `pwdExpiration` =".$db->qstr($newPwdExpiration)." WHERE `id` = " . $this->_id;
+		}
 		$res = $db->getResult($queryStr);
 		if (!$res)
 			return false;