diff --git a/src/ws/cockpitauth.c b/src/ws/cockpitauth.c
index cdc7a8adbec..ac46847bf91 100644
--- a/src/ws/cockpitauth.c
+++ b/src/ws/cockpitauth.c
@@ -559,7 +559,7 @@ authenticated_for_headers (CockpitAuth *self,
   if (!cockpit_web_server_parse_cookies (in_headers, &cookies, NULL))
     return NULL;
 
-  cookie = base64_decode_string (g_hash_table_lookup (cookies, "CockpitAuth"));
+  cookie = base64_decode_string (g_hash_table_lookup (cookies, "cockpit"));
   if (cookie == NULL)
     return NULL;
 
@@ -706,7 +706,7 @@ cockpit_auth_login_finish (CockpitAuth *self,
   if (out_headers)
     {
       cookie_b64 = g_base64_encode ((guint8 *)authenticated->cookie, strlen (authenticated->cookie));
-      header = g_strdup_printf ("CockpitAuth=%s; Path=/; Expires=Wed, 13-Jan-2021 22:23:01 GMT;%s HttpOnly",
+      header = g_strdup_printf ("cockpit=%s; Path=/; %s HttpOnly",
                                 cookie_b64, force_secure ? " Secure;" : "");
       g_free (cookie_b64);
       g_hash_table_insert (out_headers, g_strdup ("Set-Cookie"), header);