diff --git a/src/auth.rs b/src/auth.rs
index 321dbb1..31964f9 100644
--- a/src/auth.rs
+++ b/src/auth.rs
@@ -570,7 +570,6 @@ impl ConfiguredOidc {
                     &new_nonce,
                     self.plugin_config.cookie_name.as_str(),
                     self.plugin_config.cookie_duration,
-                    self.get_number_of_session_cookies() as u64,
                 );
 
                 // Build cookie headers
@@ -590,15 +589,7 @@ impl ConfiguredOidc {
 
     /// Clear the cookies and redirect to the base path or `end_session_endpoint`.
     fn logout(&self) -> Result<Action, PluginError> {
-        let cookie_values = Session::make_cookie_values(
-            // This is a bit hacky, but we need to write something into the cookie to clear all cookies (otherwise the
-            // `make_cookie_values` function will not overwrite all cookies, as "" is an empty chunk)
-            "clear",
-            "",
-            &self.plugin_config.cookie_name,
-            0,
-            self.get_number_of_session_cookies() as u64,
-        );
+        let cookie_values = Session::make_cookie_values("", "", &self.plugin_config.cookie_name, 0);
 
         let mut headers = Session::make_set_cookie_headers(&cookie_values);
 
@@ -734,7 +725,6 @@ impl ConfiguredOidc {
             &nonce,
             self.plugin_config.cookie_name.as_str(),
             self.plugin_config.cookie_duration,
-            self.get_number_of_session_cookies() as u64,
         );
 
         // Build cookie headers
@@ -835,30 +825,20 @@ impl ConfiguredOidc {
     ///
     /// The session cookie as a string if found, an error otherwise
     pub fn get_session_cookie_as_string(&self) -> Result<String, PluginError> {
-        // Find all cookies that have the cookie_name, split them by ; and remove the name from the cookie
-        // as well as the leading =. Then join the cookie values together again.
-        let cookie = self
-            .get_http_request_header("cookie")
-            .ok_or(PluginError::SessionCookieNotFoundError)?;
-
-        // Split cookie by ; and filter for the cookie name.
-        let cookies = cookie
-            .split(';')
-            .filter(|x| x.contains(self.plugin_config.cookie_name.as_str()))
-            .filter(|x| !x.contains(format!("{}-nonce", self.plugin_config.cookie_name).as_str()));
-
-        // Check if cookies have values
-        for cookie in cookies.clone() {
-            if cookie.split('=').collect::<Vec<&str>>().len() < 2 {
-                return Err(PluginError::SessionCookieNotFoundError);
-            }
-        }
-
-        // Then split all cookies by = and get the second element before joining all values together.
-        let values = cookies
-            .map(|x| x.split('=').collect::<Vec<&str>>()[1])
-            .collect::<Vec<&str>>()
-            // Join the cookie values together again.
+        let cookie_name = &self.plugin_config.cookie_name;
+
+        // Get the number of cookie parts
+        let num_parts: u8 = self
+            .get_cookie(&format!("{cookie_name}-parts"))
+            .unwrap_or_default()
+            .parse()
+            .map_err(|_| PluginError::SessionCookieNotFoundError)?;
+
+        // Get the cookie parts and concatenate them into a string
+        let values = (0..num_parts)
+            .map(|i| self.get_cookie(&format!("{cookie_name}-{i}")))
+            .collect::<Option<Vec<String>>>()
+            .ok_or(PluginError::SessionCookieNotFoundError)?
             .join("");
 
         Ok(values)
@@ -869,13 +849,4 @@ impl ConfiguredOidc {
         self.get_cookie(format!("{}-nonce", self.plugin_config.cookie_name).as_str())
             .ok_or(PluginError::NonceCookieNotFoundError)
     }
-
-    /// Helper function to get the number of session cookies from the request headers.
-    pub fn get_number_of_session_cookies(&self) -> usize {
-        let cookie = self.get_http_request_header("cookie").unwrap_or_default();
-        return cookie
-            .split(';')
-            .filter(|x| x.contains(&self.plugin_config.cookie_name))
-            .count();
-    }
 }
diff --git a/src/error.rs b/src/error.rs
index 110226e..c8d9b00 100644
--- a/src/error.rs
+++ b/src/error.rs
@@ -69,6 +69,7 @@ pub enum PluginError {
 impl ConfiguredOidc {
     pub fn show_error_page(&self, status_code: u32, title: &str, message: &str) {
         let headers = vec![("cache-control", "no-cache"), ("content-type", "text/html")];
+        let request_id = self.request_id.clone().unwrap_or_default();
 
         self.send_http_response(
             status_code,
@@ -81,7 +82,7 @@ impl ConfiguredOidc {
                     <head>
                         <meta charset="UTF-8">
                         <meta name="viewport" content="width=device-width, initial-scale=1.0">
-                        <title>Error - {}</title>
+                        <title>Error - {status_code}</title>
                         <style>
                             :root {{
                                 --bg-color: #f0f2f5;
@@ -194,10 +195,10 @@ impl ConfiguredOidc {
                             </label>
                         </div>
                         <div class="error-container">
-                            <h1>Error {}</h1>
-                            <h2>{}</h2>
-                            <p>{}</p>
-                            <p class="request-id">Request-ID: {}</p>
+                            <h1>Error {status_code}</h1>
+                            <h2>{title}</h2>
+                            <p>{message}</p>
+                            <p class="request-id">Request-ID: {request_id}</p>
                         </div>
                         <script>
                             const darkModeToggle = document.getElementById('darkModeToggle');
@@ -225,7 +226,6 @@ impl ConfiguredOidc {
                     </body>
                     </html>
                     "#,
-                    status_code, status_code, title, message, self.request_id.clone().unwrap()
                 )
                 .as_bytes(),
             ),
diff --git a/src/html.rs b/src/html.rs
index 7fa6054..680df1b 100644
--- a/src/html.rs
+++ b/src/html.rs
@@ -227,11 +227,11 @@ pub fn auth_page_html(provider_cards: String) -> String {
                 <div class="container">
                     <h1>Select a provider to authenticate with</h1>
                     <div class="provider-grid">
-                        {}
+                        {provider_cards}
                     </div>
                 </div>
                 <div class="footer">
-                    <a href="https://github.com/antonengelhardt/wasm-oidc-plugin" target="_blank" rel="noopener noreferrer">wasm-oidc-plugin</a> v{}
+                    <a href="https://github.com/antonengelhardt/wasm-oidc-plugin" target="_blank" rel="noopener noreferrer">wasm-oidc-plugin</a> v{version}
                 </div>
                 <script>
                     const darkModeToggle = document.getElementById('darkModeToggle');
@@ -272,7 +272,6 @@ pub fn auth_page_html(provider_cards: String) -> String {
                 </script>
             </body>
             </html>
-            "#,
-        provider_cards, version
+            "#
     )
 }
diff --git a/src/session.rs b/src/session.rs
index f1562b4..dbc5773 100644
--- a/src/session.rs
+++ b/src/session.rs
@@ -89,7 +89,6 @@ impl Session {
         encoded_nonce: &str,
         cookie_name: &str,
         cookie_duration: u64,
-        number_current_cookies: u64,
     ) -> Vec<String> {
         // Split every 4000 bytes
         let cookie_parts = encoded_cookie
@@ -109,6 +108,10 @@ impl Session {
             cookie_values.push(cookie_value);
         }
 
+        let num_parts = cookie_values.len();
+        let num_parts_cookie_value = format!("{cookie_name}-parts={num_parts}; Path=/; HttpOnly; Secure; Max-Age={cookie_duration}; ");
+        cookie_values.push(num_parts_cookie_value);
+
         // Build nonce cookie value
         let nonce_cookie_value = format!(
             "{}-nonce={}; Path=/; HttpOnly; Secure; Max-Age={}; ",
@@ -116,15 +119,6 @@ impl Session {
         );
         cookie_values.push(nonce_cookie_value);
 
-        // Overwrite the old cookies because decryption will fail if older and expired cookies are
-        // still present.
-        for i in cookie_values.len()..number_current_cookies as usize {
-            cookie_values.push(format!(
-                "{}-{}=; Path=/; HttpOnly; Secure; Max-Age=0",
-                cookie_name, i
-            ));
-        }
-
         cookie_values
     }