Index: trunk/core/units/users/users_item.php
===================================================================
diff -u -N -r6583 -r6791
--- trunk/core/units/users/users_item.php	(.../users_item.php)	(revision 6583)
+++ trunk/core/units/users/users_item.php	(.../users_item.php)	(revision 6791)
@@ -81,8 +81,14 @@
 			switch( $this->GetDBField('Status') )
 			{
 				case 1:
+					if ($this->Application->ConfigValue('User_Password_Auto')) {
+						$this->Application->EmailEventAdmin('USER.VALIDATE', $this->GetID() );
+						$this->Application->EmailEventUser('USER.VALIDATE', $this->GetID() );
+					}
+					else {
 					$this->Application->EmailEventAdmin('USER.ADD', $this->GetID() );
 					$this->Application->EmailEventUser('USER.ADD', $this->GetID() );
+					}
 					break;
 
 				case 2: