diff -urN core_orig/functions.inc.php core/functions.inc.php
--- core_orig/functions.inc.php	2010-05-15 12:58:35.000000000 -0400
+++ core/functions.inc.php	2010-06-30 22:16:13.000000000 -0400
@@ -1240,7 +1240,8 @@
 
 					if (isset($exten['ringtimer']) && $exten['ringtimer'] != 0)
 						$ext->add('ext-local', $exten['extension'], '', new ext_setvar('__RINGTIMER',$exten['ringtimer']));
-					
+				
+					$ext->add('ext-local', $exten['extension'], '', new extension('SIPCalledRPID(${DB(AMPUSER/'.$exten['extension'].'/cidname)},${DB(AMPUSER/'.$exten['extension'].'/cidnum)})'));	
 					$ext->add('ext-local', $exten['extension'], '', new ext_macro('exten-vm',$vm.",".$exten['extension']));
 					
 					if($vm != "novm") {