diff --git a/html/Elements/SetupSessionCookie b/html/Elements/SetupSessionCookie
index fc04017..d072358 100755
--- a/html/Elements/SetupSessionCookie
+++ b/html/Elements/SetupSessionCookie
@@ -40,7 +40,7 @@ my $pm = "$session_class.pm"; $pm =~ s|::|/|g; require $pm;
     }
     eval {
         tie %session, $session_class,
-          $SessionCookie || ( $cookies{$cookiename} ? $cookies{$cookiename}->value() : undef ),
+          ( $cookies{$cookiename} ? $cookies{$cookiename}->value() : undef ),
           $backends{$RT::DatabaseType} ? {
             Handle     => $RT::Handle->dbh,
             LockHandle => $RT::Handle->dbh,
@@ -49,7 +49,7 @@ my $pm = "$session_class.pm"; $pm =~ s|::|/|g; require $pm;
             LockDirectory => $RT::MasonSessionDir,
           };
     };
-    if ($@) {
+    if ( $@ || !($session{'CurrentUser'} && $session{'CurrentUser'}->id) ) {
 
         # If the session is invalid, create a new session.
         if ( $@ =~ /Object does not/i ) {
@@ -63,6 +63,18 @@ my $pm = "$session_class.pm"; $pm =~ s|::|/|g; require $pm;
               };
             undef $cookies{$cookiename};
         }
+        elsif ( !($session{'CurrentUser'} && $session{'CurrentUser'}->id) ) {
+            tied(%session)->delete;
+            tie %session, $session_class, undef,
+              $backends{$RT::DatabaseType} ? {
+                Handle     => $RT::Handle->dbh,
+                LockHandle => $RT::Handle->dbh,
+              } : {
+                Directory     => $RT::MasonSessionDir,
+                LockDirectory => $RT::MasonSessionDir,
+              };
+            undef $cookies{$cookiename};
+        }
         else {
             die "RT Couldn't write to session directory '$RT::MasonSessionDir': $@. Check that this dir ectory's permissions are correct.";
         }