Index: branches/stable/cgi-bin/main.cgi
===================================================================
--- branches/stable/cgi-bin/main.cgi	(revision 99)
+++ branches/stable/cgi-bin/main.cgi	(revision 100)
@@ -1219,9 +1219,13 @@
     }
     if ($webvar{alloctype} eq 'rr') {
-      if ($webvar{city} !~ /^(?:Huntsville|North Bay|Ottawa|Pembroke|Sault Ste. Marie|Sudbury|Timmins|Thunder Bay|Toronto)$/) {
+      my $flag;
+      foreach (@poplist) {
+        if (/^$webvar{city}$/) {
+	  $flag = 'y'; last;
+	}
+      }
+      if (!$flag) {
 	printAndExit("Please choose a valid POP location for a routed netblock.  Valid ".
-		"POP locations are currently:<br>\n Elliot Lake - Huntsville - North Bay -".
-		" Ottawa -". 
-		" Pembroke - Sault Ste. Marie - Sudbury - Timmins - Thunder Bay - Toronto");
+		"POP locations are currently:<br>\n".join (" - ", @poplist));
       }
     }