Index: trunk/wb/account/forgot_form.php
===================================================================
--- trunk/wb/account/forgot_form.php	(revision 321)
+++ trunk/wb/account/forgot_form.php	(revision 322)
@@ -40,7 +40,8 @@
 	$query = "SELECT user_id,username,display_name,email,last_reset,password FROM ".TABLE_PREFIX."users WHERE email = '".$wb->add_slashes($_POST['email'])."'";
 	$results = $database->query($query);
 	if($results->numRows() > 0) {
-		// Get the id, username, and email from the above db query
+	
+		// Get the id, username, email, and last_reset from the above db query
 		$results_array = $results->fetchRow();
 		
 		// Check if the password has been reset in the last 2 hours
@@ -54,6 +55,8 @@
 			
 		} else {
 		
+			$old_pass = $results_array['password'];
+
 			// Generate a random password then update the database with it
 			$new_pass = '';
 			$salt = "abchefghjkmnpqrstuvwxyz0123456789";
@@ -65,8 +68,7 @@
 				$new_pass = $new_pass . $tmp;
 				$i++;
 			}
-			$old_pass = $results_array['password'];
-			$database->query("UPDATE ".TABLE_PREFIX."users SET password = '".md5($new_pass)."' WHERE user_id = '".$results_array['user_id']."'");
+			$database->query("UPDATE ".TABLE_PREFIX."users SET password = '".md5($new_pass)."', last_reset = '".mktime()."' WHERE user_id = '".$results_array['user_id']."'");
 			
 			if($database->is_error()) {
 				// Error updating database
@@ -87,15 +89,17 @@
 
 If you have received this message in error, please delete it immediatly.';
 				// Try sending the email
-				if($wb->mail('',$mail_to,$mail_subject,$mail_message)) { 
+				if($wb->mail('From: '.SERVER_EMAIL,$mail_to,$mail_subject,$mail_message)) { 
 					$message = $MESSAGE['FORGOT_PASS']['PASSWORD_RESET'];
 					$display_form = false;
 				} else {
-  					$database->query("UPDATE ".TABLE_PREFIX."users SET password = '".$old_pass."' WHERE user_id = '".$results_array['user_id']."'");
+					$database->query("UPDATE ".TABLE_PREFIX."users SET password = '".$old_pass."' WHERE user_id = '".$results_array['user_id']."'");
 					$message = $MESSAGE['FORGOT_PASS']['CANNOT_EMAIL'];
 				}
 			}
-		}	
+		
+		}
+
 	} else {
 		// Email doesn't exist, so tell the user
 		$message = $MESSAGE['FORGOT_PASS']['EMAIL_NOT_FOUND'];