diff --git a/html/user/team.inc b/html/user/team.inc
index 284b42685f..de43305176 100644
--- a/html/user/team.inc
+++ b/html/user/team.inc
@@ -123,8 +123,8 @@ function team_table_start() {
     echo "<tr>
         <th>Name</th>
         <th>Members</th>
-        <th>Average credit</th>
-        <th>Total credit</th>
+        <th><a href=$_SERVER['PHP_SELF']?sort_by=expavg_credit>Average credit</a></th>
+        <th><a href=$_SERVER['PHP_SELF']?sort_by=total_credit>Total credit</a></th>
         <th>Country</th>
         </tr>
     ";
diff --git a/html/user/top_teams.php b/html/user/top_teams.php
index d9968ae75d..2d2f140c36 100644
--- a/html/user/top_teams.php
+++ b/html/user/top_teams.php
@@ -1,4 +1,5 @@
-<?php
+<?php {
+
     require_once("db.inc");
     require_once("util.inc");
     require_once("user.inc");
@@ -7,7 +8,13 @@
     db_init();
 
     page_head("Top teams");
-    $result = mysql_query("select * from team order by expavg_credit desc, total_credit desc");
+    $sort_by = $_GET["sort_by"];
+    if ($sort_by == "total_credit") {
+        $sort_by = "total_credit desc, total_credit desc";
+    } else {
+        $sort_by = "expavg_credit desc, total_credit desc";
+    }
+    $result = mysql_query("select * from team order by $sort_by");
     start_table();
     row1("Teams", 5);
     team_table_start();
@@ -19,4 +26,5 @@
     mysql_free_result($result);
     echo "</table>\n<p>\n";
     page_tail();
-?>
+
+} ?>