Index: googleanalytics.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/google_analytics/googleanalytics.module,v
retrieving revision 1.36.2.29
diff -u -r1.36.2.29 googleanalytics.module
--- googleanalytics.module	16 Jan 2011 22:45:09 -0000	1.36.2.29
+++ googleanalytics.module	17 Jan 2011 23:57:31 -0000
@@ -480,9 +480,16 @@
  */
 function googleanalytics_token_values($type, $object = NULL, $options = array()) {
   if ($type == 'user') {
-    $user = $object;
-    $tokens['user-role-names'] = implode(',', $user->roles);
-    $tokens['user-role-ids'] = implode(',', array_keys($user->roles));
+    if (!empty($object)) {
+      $account = $object;
+    }
+    else {
+      $account = user_load(array('uid' => $GLOBALS['user']->uid));
+    }
+
+    $tokens['user-role-names'] = implode(',', $account->roles);
+    $tokens['user-role-ids'] = implode(',', array_keys($account->roles));
+
     return $tokens;
   }
 }
