--- vcard.module	2007-11-25 06:30:10.000000000 -0500
+++ vcard.module	2007-11-30 20:01:28.000000000 -0500
@@ -244,14 +244,16 @@
   }
 
   // URL
-  if (!empty($vcard_map['url'])) {
-    $vcard->setURL($vcard_map['url']);
-  }
+   $url = vcard_get_field('url', $account);
+   if (!empty($url)) {
+     $vcard->setURL($url);
+   }
 
   // Telephone
-  if (!empty($vcard_map['telephone'])) {
-    $vcard->setURL($vcard_map['telephone']);
-  }
+   $tel = vcard_get_field('telephone', $account);
+   if (!empty($tel)) {
+     $vcard->addTelephone($tel);
+   }
   
   // Address
   $street = vcard_get_field('street', $account);
@@ -386,11 +388,9 @@
  * @return vCard object, null if library is not available.
  */
 function _vcard_init() {
-  @include_once 'Contact_Vcard_Build.php';
-  if (function_exists('Contact_Vcard_Build')) {
+  include_once 'Contact_Vcard_Build.php';
     $vcard = new Contact_Vcard_Build();
     return $vcard;
-  }
 }
 
 function _vcard_profile_fields() {