Index: subuser.module
===================================================================
--- subuser.module	(revision 51)
+++ subuser.module	(working copy)
@@ -596,3 +596,45 @@
 
   return $data;
 }
+
+/**
+ * Implementation of hook_token_list().
+ */
+function subuser_token_list($type = 'all') {
+  $tokens = array();
+  
+  if ($type == 'user' || $type == 'all') {
+    $user_tokens = user_token_list('user');
+    
+    foreach ($user_tokens['user'] as $user_token => $description) {
+      $tokens['user']['parent-' . $user_token] = $description;
+    }
+  }
+
+  return $tokens;
+}
+
+/**
+ * Implementation of hook_token_values().
+ */
+function subuser_token_values($type, $object = NULL) {
+  $values = array();
+  
+  if ($type == 'user') {
+    $account = $object;
+    
+    $parent_id = subuser_get_parent($account->uid);
+    
+    if (!empty($parent_id)) {
+      $parent = user_load($parent_id);
+      
+      $user_tokens = user_token_values('user', $parent);
+      
+      foreach ($user_tokens as $user_token => $value) {
+        $values['parent-' . $user_token] = $value;
+      }
+    }
+  }
+  
+  return $values;
+}