diff --git a/webtools/bugzilla/enter_bug.cgi b/webtools/bugzilla/enter_bug.cgi
index b5d9a66f93f9..72617972248c 100755
--- a/webtools/bugzilla/enter_bug.cgi
+++ b/webtools/bugzilla/enter_bug.cgi
@@ -300,10 +300,16 @@ $default{'rep_platform'} = pickplatform();
 $vars->{'op_sys'} = \@legal_opsys; 
 $default{'op_sys'} = pickos();
 
-# Default version is the last one in the list (hopefully the latest one).
+# Posting a bug sets a cookie for the current version, if one exists. Else,
+# the default version is the last one in the list (hopefully the latest one).
 # Eventually maybe each product should have a "current version" parameter.
 $vars->{'version'} = $::versions{$product} || [];
-$default{'version'} = $vars->{'version'}->[$#{$vars->{'version'}}];
+if (exists $::COOKIE{"VERSION-$product"} &&
+    lsearch($vars->{'version'}, $::COOKIE{"VERSION-$product"}) != -1) {
+    $default{'version'} = $::COOKIE{"VERSION-$product"};
+} else {
+    $default{'version'} = $vars->{'version'}->[$#{$vars->{'version'}}];
+}
 
 # There must be at least one status in @status.
 my @status = "NEW";
diff --git a/webtools/bugzilla/post_bug.cgi b/webtools/bugzilla/post_bug.cgi
index 5980f714bb45..42e550fbda93 100755
--- a/webtools/bugzilla/post_bug.cgi
+++ b/webtools/bugzilla/post_bug.cgi
@@ -73,9 +73,6 @@ my $product = $::FORM{'product'};
 # Set cookies
 my $cookiepath = Param("cookiepath");
 if (exists $::FORM{'product'}) {
-    print "Set-Cookie: PLATFORM=$product ; path=$cookiepath ; \
-           expires=Sun, 30-Jun-2029 00:00:00 GMT\n";
-    
     if (exists $::FORM{'version'}) {           
         print "Set-Cookie: VERSION-$product=$::FORM{'version'} ; \
                path=$cookiepath ; expires=Sun, 30-Jun-2029 00:00:00 GMT\n";