Index: notifications.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/notifications/notifications.module,v
retrieving revision 1.6.2.9.2.50.2.8
diff -u -p -r1.6.2.9.2.50.2.8 notifications.module
--- notifications.module	29 Apr 2009 16:24:08 -0000	1.6.2.9.2.50.2.8
+++ notifications.module	8 Jun 2009 00:56:25 -0000
@@ -1183,7 +1183,7 @@ function notifications_token_values($typ
       }
       return $values;
     case 'user':
-      if ($account = $object) {
+      if ($object->uid > 0 and $account = $object) {
         $values['subscriptions-manage'] = $account->uid ? url("user/$account->uid/notifications", array('absolute' => TRUE)) : '';
         $link = notifications_get_link('unsubscribe', array('uid' => $account->uid, 'signed' => TRUE, 'destination' => FALSE, 'absolute' => TRUE));
         $values['unsubscribe-url-global'] = url($link['href'], $link['options']);
@@ -1291,7 +1291,7 @@ function notifications_get_link($type, $
       if (!empty($params['sid'])) {      
         $elements = array('unsubscribe', 'sid', $params['sid']);        
       }
-      elseif (!empty($params['uid'])) {
+      elseif (isset($params['uid'])) {
         $elements = array('unsubscribe', 'uid', $params['uid']); 
       }
       break;