diff --git a/SeedDMS_Core/Core/inc.ClassDMS.php b/SeedDMS_Core/Core/inc.ClassDMS.php
index c109a33b3..14d9066e0 100644
--- a/SeedDMS_Core/Core/inc.ClassDMS.php
+++ b/SeedDMS_Core/Core/inc.ClassDMS.php
@@ -1279,8 +1279,10 @@ class SeedDMS_Core_DMS {
 		}
 		if($role == '')
 			$role = '0';
-		if(trim($pwdexpiration) == '')
+		if(trim($pwdexpiration) == '' || trim($pwdexpiration) == 'never')
 			$pwdexpiration = '0000-00-00 00:00:00';
+		elseif(trim($pwdexpiration) == 'now')
+			$pwdexpiration = date('Y-m-d H:i:s');
 		$queryStr = "INSERT INTO `tblUsers` (`login`, `pwd`, `fullName`, `email`, `language`, `theme`, `comment`, `role`, `hidden`, `disabled`, `pwdExpiration`, `quota`, `homefolder`) VALUES (".$db->qstr($login).", ".$db->qstr($pwd).", ".$db->qstr($fullName).", ".$db->qstr($email).", '".$language."', '".$theme."', ".$db->qstr($comment).", '".intval($role)."', '".intval($isHidden)."', '".intval($isDisabled)."', ".$db->qstr($pwdexpiration).", '".intval($quota)."', ".($homefolder ? intval($homefolder) : "NULL").")";
 		$res = $this->db->getResult($queryStr);
 		if (!$res)