--- url_old.php	2010-01-20 22:07:14.000000000 -0500
+++ url.php	2010-01-20 22:26:45.000000000 -0500
@@ -5,6 +5,7 @@ require_once 'CRM/Core/Config.php';
 require_once 'CRM/Core/Error.php';
 require_once 'CRM/Utils/Array.php';
 require_once 'extern/stubs.php';
+require_once '../api/v2/Contact.php';
 
 $config =& CRM_Core_Config::singleton();
 
@@ -17,6 +18,25 @@ if (isset($_GET['qid'])) {
 }
 $url_id = CRM_Utils_Array::value( 'u', $_GET );
 
+if (isset($_GET['umail'])) {
+  $umail_address = CRM_Utils_Array::value( 'umail', $_GET );
+  $params = array('email' => $umail_address,
+                  'return.contact_id' => 1
+                 );
+  $result = civicrm_contact_search($params);
+  if (civicrm_error($result)) {
+    echo $result['error_message'];
+  }
+  else if(count($result) > 1) {
+    $cid = "";
+  }
+  else {
+    foreach ($result as $id => $data) {
+      $cid = $id;
+    }
+  }
+}
+
 if ( ! $queue_id ||
      ! $url_id ) {
     echo "Missing input parameters\n";
@@ -24,7 +44,7 @@ if ( ! $queue_id ||
 }
 
 require_once 'CRM/Mailing/Event/BAO/TrackableURLOpen.php';
-$url = CRM_Mailing_Event_BAO_TrackableURLOpen::track($queue_id, $url_id);
+$url = CRM_Mailing_Event_BAO_TrackableURLOpen::track($queue_id, $url_id, $cid);
 
 CRM_Utils_System::redirect($url);