diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 9cf5ce128..e15e606a2 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -69,7 +69,8 @@ def payment_methods
     if current_member
       PaymentMethodFetcher.new(current_member).fetch
     else
-      PaymentMethodFetcher.new(recognized_member, filter: (cookies.signed[:payment_methods] || '').split(',')).fetch
+      payment_method_ids = (cookies.signed[:payment_methods] || '').split(',')
+      PaymentMethodFetcher.new(recognized_member, filter: payment_method_ids).fetch
     end
   end
 
diff --git a/app/controllers/email_confirmation_controller.rb b/app/controllers/email_confirmation_controller.rb
index 42f90ad6e..9ac62b799 100644
--- a/app/controllers/email_confirmation_controller.rb
+++ b/app/controllers/email_confirmation_controller.rb
@@ -12,7 +12,12 @@ def verify
 
     if verifier.success?
       minutes_in_a_year = 1.year.abs / 60
-      cookies.signed['authentication_id'] = encode_jwt(verifier.authentication.member.token_payload, minutes_in_a_year)
+      encoded_jwt = encode_jwt(verifier.authentication.member.token_payload, minutes_in_a_year)
+
+      cookies.signed['authentication_id'] = {
+        value: encoded_jwt,
+        expires: 1.year.from_now
+      }
     end
 
     @rendered = template.render('errors' => verifier.errors).html_safe