diff --git a/bans.php b/bans.php
index f2db419..7a038c1 100644
--- a/bans.php
+++ b/bans.php
@@ -16,11 +16,12 @@ foreach ($rows as $row) {
     if ($player_name === null) continue;
 
     $page->print_table_rows($row, array(
-        $page->t("bans_player") => $page->get_avatar($player_name, $row['uuid']),
-        $page->t("bans_by")     => $page->get_avatar($page->get_banner_name($row), $row['banned_by_uuid']),
-        $page->t("bans_reason") => $page->clean($row['reason']),
-        $page->t("bans_when")   => $page->millis_to_date($row['time']),
-        $page->t("bans_expiry") => $page->expiry($row),
+        $page->t("bans_player")   => $page->get_avatar($player_name, $row['uuid']),
+        $page->t("bans_by")       => $page->get_avatar($page->get_banner_name($row), $row['banned_by_uuid']),
+        $page->t("bans_reason")   => $page->clean($row['reason']),
+        $page->t("bans_when")     => $page->millis_to_date($row['time']),
+        $page->t("bans_expiry")   => $page->expiry($row),
+        $page->t("column_server") => $page->server($row),
     ));
 }
 $page->table_end();
diff --git a/history.php b/history.php
index 863dfaf..142726e 100644
--- a/history.php
+++ b/history.php
@@ -170,6 +170,7 @@ try {
                 $page->t("history_tablereason")    => $page->clean($row['reason']),
                 $page->t("history_tabledate")      => $page->millis_to_date($row['time']),
                 $page->t("history_tableexpires")   => $page->expiry($row),
+                $page->t("column_server")          => $page->server($row),
                 //'i' => $i . "/" . $limit . "/" . $total,
             ));
         }
diff --git a/inc/page.php b/inc/page.php
index 58f19cd..8adfa3a 100644
--- a/inc/page.php
+++ b/inc/page.php
@@ -272,6 +272,16 @@ class Page {
         return $text;
     }
 
+    function server($row, $col = "server_scope") {
+        $server = $this->clean($row[$col]);
+        if ($server === null) {
+            return "-";
+        }
+        if ($server === "*") {
+            return $this->t("column_server_global");
+        }
+        return $server;
+    }
 
     /**
      * Returns a string that shows the expiry date of a punishment.
diff --git a/info.php b/info.php
index e2b1e48..88bb59a 100644
--- a/info.php
+++ b/info.php
@@ -60,6 +60,7 @@ class BanInfo extends Info {
             $page->t("info_banned_reason") => $page->clean($row['reason']),
             $page->t("info_banned_when")   => $page->millis_to_date($row['time']),
             $page->t("info_banned_expiry") => $page->expiry($row),
+            $page->t("column_server")      => $page->server($row),
         );
     }
 }
@@ -73,6 +74,7 @@ class MuteInfo extends Info {
             $page->t("info_muted_reason") => $page->clean($row['reason']),
             $page->t("info_muted_when")   => $page->millis_to_date($row['time']),
             $page->t("info_muted_expiry") => $page->expiry($row),
+            $page->t("column_server")     => $page->server($row),
         );
     }
 }
@@ -90,6 +92,7 @@ class WarnInfo extends Info {
             $page->t("info_warn_reason") => $page->clean($row['reason']),
             $page->t("info_warn_when")   => $page->millis_to_date($row['time']),
             $page->t("info_warn_expiry") => $page->expiry($row),
+            $page->t("column_server")    => $page->server($row),
         );
     }
 }
@@ -102,6 +105,7 @@ class KickInfo extends Info {
             $page->t("info_kick_by")     => $this->moderator_avatar($row),
             $page->t("info_kick_reason") => $page->clean($row['reason']),
             $page->t("info_kick_when")   => $page->millis_to_date($row['time']),
+            $page->t("column_server")    => $page->server($row),
         );
     }
 }
diff --git a/kicks.php b/kicks.php
index 7e07005..bab1e6e 100644
--- a/kicks.php
+++ b/kicks.php
@@ -16,10 +16,11 @@ foreach ($rows as $row) {
     if ($player_name === null) continue;
 
     $page->print_table_rows($row, array(
-        $page->t("kicks_player") => $page->get_avatar($player_name, $row['uuid']),
-        $page->t("kicks_by")     => $page->get_avatar($page->get_banner_name($row), $row['banned_by_uuid']),
-        $page->t("kicks_reason") => $page->clean($row['reason']),
-        $page->t("kicks_when")   => $page->millis_to_date($row['time']),
+        $page->t("kicks_player")  => $page->get_avatar($player_name, $row['uuid']),
+        $page->t("kicks_by")      => $page->get_avatar($page->get_banner_name($row), $row['banned_by_uuid']),
+        $page->t("kicks_reason")  => $page->clean($row['reason']),
+        $page->t("kicks_when")    => $page->millis_to_date($row['time']),
+        $page->t("column_server") => $page->server($row, "server_origin"),
     ));
 }
 $page->table_end();
diff --git a/lang/en_US.utf8.php b/lang/en_US.utf8.php
index d555e2c..dece371 100644
--- a/lang/en_US.utf8.php
+++ b/lang/en_US.utf8.php
@@ -86,6 +86,9 @@ class DefaultLang {
         $array["warns_when"] = "Warned Until";
         $array["warns_receive"] = "Received Warning";
 
+        $array["column_server"] = "Server";
+        $array["column_server_global"] = "*";
+
         // Errors which are only accessible from invalid user input or removed pages.
         $array["check_invalid"] = "Invalid name.";
         $array["history_missinguuid"] = "Missing arguments (uuid).";
diff --git a/mutes.php b/mutes.php
index ea78bab..0987268 100644
--- a/mutes.php
+++ b/mutes.php
@@ -16,11 +16,12 @@ foreach ($rows as $row) {
     if ($player_name === null) continue;
 
     $page->print_table_rows($row, array(
-        $page->t("mutes_player") => $page->get_avatar($player_name, $row['uuid']),
-        $page->t("mutes_by")     => $page->get_avatar($page->get_banner_name($row), $row['banned_by_uuid']),
-        $page->t("mutes_reason") => $page->clean($row['reason']),
-        $page->t("mutes_when")   => $page->millis_to_date($row['time']),
-        $page->t("mutes_expiry") => $page->expiry($row),
+        $page->t("mutes_player")  => $page->get_avatar($player_name, $row['uuid']),
+        $page->t("mutes_by")      => $page->get_avatar($page->get_banner_name($row), $row['banned_by_uuid']),
+        $page->t("mutes_reason")  => $page->clean($row['reason']),
+        $page->t("mutes_when")    => $page->millis_to_date($row['time']),
+        $page->t("mutes_expiry")  => $page->expiry($row),
+        $page->t("column_server") => $page->server($row),
     ));
 }
 $page->table_end();
diff --git a/warnings.php b/warnings.php
index f590c41..46dc63c 100644
--- a/warnings.php
+++ b/warnings.php
@@ -21,6 +21,7 @@ foreach ($rows as $row) {
         $page->t("warns_reason")  => $page->clean($row['reason']),
         $page->t("warns_when")    => $page->expiry($row),
         $page->t("warns_receive") => (($page->active($row, 'warned') === true) ? "1" : "0"),
+        $page->t("column_server") => $page->server($row),
     ));
 }
 $page->table_end();