Index: branches/5.2.x/units/gift_certificates/gift_certificates_eh.php
===================================================================
diff -u -N -r15149 -r15423
--- branches/5.2.x/units/gift_certificates/gift_certificates_eh.php	(.../gift_certificates_eh.php)	(revision 15149)
+++ branches/5.2.x/units/gift_certificates/gift_certificates_eh.php	(.../gift_certificates_eh.php)	(revision 15423)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: gift_certificates_eh.php 15149 2012-03-04 09:05:03Z alex $
+* @version	$Id: gift_certificates_eh.php 15423 2012-07-02 15:03:28Z alex $
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
@@ -184,15 +184,16 @@
 			$send_params = Array (
 				'from_email' => $this->Application->ConfigValue('DefaultEmailSender'),
 				'from_name' => $object->GetDBField('Purchaser'),
-				'to_email' => $object->GetDBField('RecipientEmail'),
-				'to_name' => $object->GetDBField('Recipient'),
 				'message' => $object->GetDBField('Message'),
 				'amount' => $object->GetField('Amount'),
 				'gifcert_id' => $object->GetDBField('Code'),
 			);
 
-			$this->Application->EmailEventUser('USER.GIFTCERTIFICATE', null, $send_params);
 			$this->Application->EmailEventAdmin('USER.GIFTCERTIFICATE', null, $send_params);
+
+			$send_params['to_email'] = $object->GetDBField('RecipientEmail');
+			$send_params['to_name'] = $object->GetDBField('Recipient');
+			$this->Application->EmailEventUser('USER.GIFTCERTIFICATE', null, $send_params);
 		}
 
 		$this->clearSelectedIDs($event);