Index: trunk/pstamp/scripts/pstampparse.pl
===================================================================
--- trunk/pstamp/scripts/pstampparse.pl	(revision 38195)
+++ trunk/pstamp/scripts/pstampparse.pl	(revision 38487)
@@ -142,6 +142,5 @@
 
 if ($extver eq "1") {
-    print STDERR "WARNING WARNING WARNING\n";
-    print STDERR "Very soon version 1 postage stamp requests will be rejected. Please update your request tables to version 2 format.\n";
+    print STDERR "Version 1 postage stamp requests are no longer accepted. Please update your request tables to version 2 format.\n";
     print STDERR "Note that EMAIL will not be optional\n";
 
@@ -247,5 +246,5 @@
 # if any is known. Do we want to do this for any other channels?
 # requests from data store will have those values.
-if ($label and $label eq 'WEB.UP') {
+if ($label and ($label eq 'WEB.UP' or $label eq 'WEB')) {
     if ($labelForUser) {
         $label = $labelForUser;