diff --git a/keyserver/src/responders/user-responders.js b/keyserver/src/responders/user-responders.js
--- a/keyserver/src/responders/user-responders.js
+++ b/keyserver/src/responders/user-responders.js
@@ -314,7 +314,7 @@
 const siweAuthRequestInputValidator = tShape({
   signature: t.String,
   message: t.String,
-  calendarQuery: t.maybe(entryQueryInputValidator),
+  calendarQuery: entryQueryInputValidator,
   deviceTokenUpdateRequest: t.maybe(deviceTokenUpdateRequestInputValidator),
   platformDetails: tPlatformDetails,
   watchedIDs: t.list(t.String),
@@ -332,6 +332,7 @@
     deviceTokenUpdateRequest,
     platformDetails,
   } = request;
+  const calendarQuery = normalizeCalendarQuery(request.calendarQuery);
 
   // 1. Ensure that `message` is a well formed Comm SIWE Auth message.
   const siweMessage: SIWEMessage = new SiweMessage(message);
@@ -383,7 +384,7 @@
   }
 
   // 5. Complete login with call to `processSuccessfulLogin(...)`.
-  return await processSuccessfulLogin(viewer, input, userID);
+  return await processSuccessfulLogin(viewer, input, userID, calendarQuery);
 }
 
 const updatePasswordRequestInputValidator = tShape({