diff --git a/includes/common.inc b/includes/common.inc
index 9151bcdc256..9d613584ace 100644
--- a/includes/common.inc
+++ b/includes/common.inc
@@ -295,14 +295,21 @@ function format_date($timestamp, $type = "medium", $format = "") {
 }
 
 function format_name($object) {
+  global $PHP_SELF;
 
   if ($object->uid && $object->name) {
-    return "<a href=\"module.php?mod=user&op=view&id=$object->uid\">$object->name</a>";
+    if (strstr($PHP_SELF, "admin.php")) {
+      $output = "<a href=\"admin.php?mod=user&op=edit&id=$object->uid\">$object->name</a>";
+    }
+    else {
+      $output = "<a href=\"module.php?mod=user&op=view&id=$object->uid\">$object->name</a>";
+    }
   }
   else {
-    return variable_get(anonymous, "Anonymous");
+    $output = variable_get(anonymous, "Anonymous");
   }
 
+  return $output;
 }
 
 function format_email($address) {