diff --git a/html/user/team_quit_action.php b/html/user/team_quit_action.php
index 4c746440b7..5e6096061c 100644
--- a/html/user/team_quit_action.php
+++ b/html/user/team_quit_action.php
@@ -40,7 +40,7 @@
             page_head("Quit $team_name");
             echo "<h2>Removed from team</h2>";
             echo "You have been removed from <a href=team_display.php?teamid=$team->id>$team_name</a>";
-            if (!$new_nusers) {
+            if ($new_nusers <= 0) {
                 echo "<p>Since you were the last member of the team, it has been disbanded.";
             }
         } else {
diff --git a/html/user/team_remove_inactive_action.php b/html/user/team_remove_inactive_action.php
index 091d5ca9dc..6c4724f9d9 100644
--- a/html/user/team_remove_inactive_action.php
+++ b/html/user/team_remove_inactive_action.php
@@ -1,4 +1,4 @@
-<?php
+<?php {
 
     require_once("util.inc");
     require_once("team.inc");
@@ -41,10 +41,15 @@
              }
          }
     }
-    $new_nusers = $$team->nusers - $nmembers;
-    $query = "update team set nusers = $new_nusers where id = $team->id";
+    $new_nusers = $team->nusers - $nmembers;
+    if ($new_nusers > 0) {
+        $query = "update team set nusers = $new_nusers where id = $team->id";
+    } else {
+        $query = "remove team where id=$team->id";
+        echo "<p><b>The team has been disbanded because there are no more members.</b>";
+    }
     $result = mysql_query($query);
 
     page_tail();
 
-?>
+} ?>