Index: modules/callbacks.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/entity/modules/Attic/callbacks.inc,v
retrieving revision 1.1.2.4
diff -u -r1.1.2.4 callbacks.inc
--- modules/callbacks.inc	29 Dec 2010 12:03:11 -0000	1.1.2.4
+++ modules/callbacks.inc	30 Dec 2010 21:29:35 -0000
@@ -290,13 +290,20 @@
 function entity_metadata_user_get_properties($account, array $options, $name, $entity_type) {
   switch ($name) {
     case 'last_login':
-      return $account->login;
+      return empty($account->login) ? NULL : $account->login;
 
     case 'name':
-      return ($account->uid == 0) ? variable_get('anonymous', t('Anonymous')) : $account->name;
+      return empty($account->uid) ? variable_get('anonymous', t('Anonymous')) : $account->name;
+
+    case 'url':
+      if (empty($account->uid)) {
+        return NULL;
+      }
+      $return = entity_uri('user', $account);
+      return $return ? url($return['path'], $return['options'] + $options) : '';
 
     case 'edit_url':
-      return url("user/$account->uid/edit", $options);
+      return empty($account->uid) ? NULL : url("user/$account->uid/edit", $options);
 
     case 'roles':
       return isset($account->roles) ? array_keys($account->roles) : array();
Index: modules/user.info.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/entity/modules/Attic/user.info.inc,v
retrieving revision 1.1.2.2
diff -u -r1.1.2.2 user.info.inc
--- modules/user.info.inc	21 Dec 2010 10:07:41 -0000	1.1.2.2
+++ modules/user.info.inc	30 Dec 2010 21:29:35 -0000
@@ -38,7 +38,7 @@
   $properties['url'] = array(
     'label' => t("URL"),
     'description' => t("The URL of the account profile page."),
-    'getter callback' => 'entity_metadata_entity_get_properties',
+    'getter callback' => 'entity_metadata_user_get_properties',
     'type' => 'uri',
   );
   $properties['edit_url'] = array(