diff --git a/fasttoggle.module b/fasttoggle.module
index d7c8995..9ab36a5 100644
--- a/fasttoggle.module
+++ b/fasttoggle.module
@@ -109,24 +109,23 @@ function fasttoggle_perm() {
  *
  * Add togglable links to user pages.
  */
-function fasttoggle_user($type, &$edit, &$user) {
-  if ($type == 'categories' || $type == 'register' || $type == "validate")
-    return;
-  
-  $links = fasttoggle_link('user', $user, TRUE);
-  if (array_key_exists('fasttoggle_status', $links)) {
-    $link = $links['fasttoggle_status'];
-    $user->content['fasttoggle'] = array(
-      '#value' => t('Status') .': '. l($link['title'], $link['href'], $link),
-    );
-    unset($links['fasttoggle_status']);
-  }
-  
-  if ($type == "view" && !empty($links)) {
-    foreach($links as $name => $link) {
-      $user->content[$name] = array(
-          '#value' => t('Role') .': '. l($link['title'], $link['href'], $link),
+function fasttoggle_user($op, &$edit, &$account) {
+  if ($op == 'view') {
+    $links = fasttoggle_link('user', $account, TRUE);
+    if (!empty($links['fasttoggle_status'])) {
+      $link = $links['fasttoggle_status'];
+      $account->content['fasttoggle'] = array(
+        '#value' => t('Status') .': '. l($link['title'], $link['href'], $link),
       );
+      unset($links['fasttoggle_status']);
+    }
+
+    if (!empty($links)) {
+      foreach($links as $name => $link) {
+        $account->content[$name] = array(
+            '#value' => t('Role') .': '. l($link['title'], $link['href'], $link),
+        );
+      }
     }
   }
 }