Index: branches/unlabeled/unlabeled-1.11.2/kernel/units/users/users_item.php
===================================================================
diff -u -r6582 -r6675
--- branches/unlabeled/unlabeled-1.11.2/kernel/units/users/users_item.php	(.../users_item.php)	(revision 6582)
+++ branches/unlabeled/unlabeled-1.11.2/kernel/units/users/users_item.php	(.../users_item.php)	(revision 6675)
@@ -81,8 +81,14 @@
 			switch( $this->GetDBField('Status') )
 			{
 				case 1:
-					$this->Application->EmailEventAdmin('USER.ADD', $this->GetID() );
-					$this->Application->EmailEventUser('USER.ADD', $this->GetID() );
+					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: