diff --git a/mozilla/webtools/bugzilla/Bugzilla/Auth/Login/CGI.pm b/mozilla/webtools/bugzilla/Bugzilla/Auth/Login/CGI.pm
index 2a61a54f77f..980e2712390 100644
--- a/mozilla/webtools/bugzilla/Bugzilla/Auth/Login/CGI.pm
+++ b/mozilla/webtools/bugzilla/Bugzilla/Auth/Login/CGI.pm
@@ -45,7 +45,7 @@ sub get_login_info {
     my $username = trim($cgi->param("Bugzilla_login"));
     my $password = $cgi->param("Bugzilla_password");
 
-    $cgi->delete('Bugzilla_login', 'Bugzilla_password');
+    $cgi->delete('Bugzilla_login', 'Bugzilla_password', 'GoAheadAndLogIn');
 
     if (!defined $username || !defined $password) {
         return { failure => AUTH_NODATA };
diff --git a/mozilla/webtools/bugzilla/post_bug.cgi b/mozilla/webtools/bugzilla/post_bug.cgi
index 2ef2dcde590..0f23e7d98be 100755
--- a/mozilla/webtools/bugzilla/post_bug.cgi
+++ b/mozilla/webtools/bugzilla/post_bug.cgi
@@ -53,6 +53,9 @@ my $vars = {};
 # Main Script
 ######################################################################
 
+# redirect to enter_bug if no field is passed.
+print $cgi->redirect(correct_urlbase() . 'enter_bug.cgi') unless $cgi->param();
+
 # Detect if the user already used the same form to submit a bug
 my $token = trim($cgi->param('token'));
 if ($token) {