Get cookie expiry to work, and correct IDs on checkboxes.

2 files changed, 7 insertions, 1 deletions

diff --git a/perllib/Catalyst/Plugin/Session/State/Cookie.pm b/perllib/Catalyst/Plugin/Session/State/Cookie.pm
index 7ffc77f1f..c4b61123b 100644
--- a/perllib/Catalyst/Plugin/Session/State/Cookie.pm
+++ b/perllib/Catalyst/Plugin/Session/State/Cookie.pm
@@ -127,6 +127,8 @@ sub set_session_cookie_expire {
     else {
         delete $c->session->{__cookie_expires};
     }
+    # Force the cookie to be regenerated
+    $c->set_session_id( $c->sessionid );
     return 1;
 }
 
diff --git a/perllib/FixMyStreet/App/Controller/Auth.pm b/perllib/FixMyStreet/App/Controller/Auth.pm
index 8aed746ec..ebb3510d0 100644
--- a/perllib/FixMyStreet/App/Controller/Auth.pm
+++ b/perllib/FixMyStreet/App/Controller/Auth.pm
@@ -71,7 +71,11 @@ sub sign_in : Private {
         return 1;
     }
 
-    $c->stash->{sign_in_error} = 1;
+    $c->stash(
+        sign_in_error => 1,
+        email => $email,
+        remember_me => $remember_me,
+    );
     return;
 }