diff --git a/user.inc.php b/user.inc.php
index 27eb33a..b5f0b1a 100644
--- a/user.inc.php
+++ b/user.inc.php
@@ -233,6 +233,7 @@ function user_save($u)
 
 		$data = mysql_escape_string(stripslashes($u[$f]));
 		$set .= "$f='$data'";
+		if($f=="password") $set.=",passwordset=NOW()";
 	}
 	//echo "<pre>";
 	//print_r($u);
@@ -338,7 +339,7 @@ function user_create($type, $u = NULL)
 {
 	if(!is_array($u)) {
 		mysql_query("INSERT INTO users (`types`,`passwordset`,`created`) 
-				VALUES ('$type', NOW(), NOW())");
+				VALUES ('$type', '0000-00-00', NOW())");
 		$uid = mysql_insert_id();
 	} else {
 		/* The user has been specified and already exists,