diff --git a/src/__fixtures__/authUsers.ts b/src/__fixtures__/authUsers.ts
index b1de484a6..96f90deb3 100644
--- a/src/__fixtures__/authUsers.ts
+++ b/src/__fixtures__/authUsers.ts
@@ -1,4 +1,5 @@
 import { ObjectId } from 'bson'
+import { DateTime } from 'luxon'
 import type { SessionUser, PortalUser, Collection, Widget } from 'types'
 
 const mockNews: Widget = {
@@ -111,6 +112,7 @@ export const testPortalUser1: PortalUser = {
   ],
   displayName: 'BERNADETTE CAMPBELL',
   theme: 'light',
+  lastLoginAt: DateTime.now().toISO()!,
 }
 
 export const portalUserMaxedOutCollection: PortalUser = {
@@ -156,6 +158,7 @@ export const portalUserMaxedOutCollection: PortalUser = {
   ],
   displayName: 'BERNADETTE CAMPBELL',
   theme: 'light',
+  lastLoginAt: DateTime.now().toISO()!,
 }
 
 export const portalUserWithExampleCollection: PortalUser = {
@@ -194,6 +197,7 @@ export const portalUserWithExampleCollection: PortalUser = {
   ],
   displayName: 'BERNADETTE CAMPBELL',
   theme: 'light',
+  lastLoginAt: DateTime.now().toISO()!,
 }
 
 const mockCollectionWithGuardianIdeal: Widget = {
@@ -207,6 +211,7 @@ export const portalUserGuardianIdeal: PortalUser = {
   mySpace: [mockCollectionWithGuardianIdeal],
   displayName: 'BERNADETTE CAMPBELL',
   theme: 'dark',
+  lastLoginAt: DateTime.now().toISO()!,
 }
 
 const mockCollectionWithFeaturedShortcuts: Widget = {
@@ -220,6 +225,7 @@ export const portalUserFeaturedShortcuts: PortalUser = {
   mySpace: [mockCollectionWithFeaturedShortcuts],
   displayName: 'BERNADETTE CAMPBELL',
   theme: 'dark',
+  lastLoginAt: DateTime.now().toISO()!,
 }
 
 const mockCollection: Collection = {
@@ -260,6 +266,7 @@ export const portalUserCollectionLimit: PortalUser = {
   mySpace: maxCollections,
   displayName: 'BERNADETTE CAMPBELL',
   theme: 'light',
+  lastLoginAt: DateTime.now().toISO()!,
 }
 
 export const portalUserAlmostAtCollectionLimit: PortalUser = {
@@ -267,6 +274,7 @@ export const portalUserAlmostAtCollectionLimit: PortalUser = {
   mySpace: almostMaxCollections,
   displayName: 'BERNADETTE CAMPBELL',
   theme: 'light',
+  lastLoginAt: DateTime.now().toISO()!,
 }
 
 export const portalUserCollectionLimitWithAllAdditionalWidgets: PortalUser = {
@@ -279,6 +287,7 @@ export const portalUserCollectionLimitWithAllAdditionalWidgets: PortalUser = {
   ],
   displayName: 'BERNADETTE CAMPBELL',
   theme: 'light',
+  lastLoginAt: DateTime.now().toISO()!,
 }
 
 export const portalUserNoCollections: PortalUser = {
diff --git a/src/models/User.test.ts b/src/models/User.test.ts
index 6b93f7373..c41b17361 100644
--- a/src/models/User.test.ts
+++ b/src/models/User.test.ts
@@ -1,4 +1,5 @@
 import { Db, MongoClient } from 'mongodb'
+import { DateTime, Settings } from 'luxon'
 
 import User from './User'
 import {
@@ -6,7 +7,6 @@ import {
   exampleCollection1,
 } from '__fixtures__/newPortalUser'
 import { WIDGETS } from 'constants/index'
-import { DateTime, Settings } from 'luxon'
 
 let connection: typeof MongoClient
 let db: typeof Db
diff --git a/src/models/User.ts b/src/models/User.ts
index c85e9f5fa..1c06896fe 100644
--- a/src/models/User.ts
+++ b/src/models/User.ts
@@ -1,4 +1,5 @@
 import { Context } from '@apollo/client'
+import { DateTime } from 'luxon'
 
 import { CollectionModel } from './Collection'
 import { MySpaceModel } from './MySpace'
@@ -8,7 +9,6 @@ import type {
   WidgetInputType,
 } from 'types/index'
 import { WIDGETS } from 'constants/index'
-import { DateTime } from 'luxon'
 
 type EditDisplayName = {
   userId: string
diff --git a/src/pages/api/graphql.tsx b/src/pages/api/graphql.tsx
index 638c84bac..4a3f0d5cd 100644
--- a/src/pages/api/graphql.tsx
+++ b/src/pages/api/graphql.tsx
@@ -3,6 +3,7 @@ import { ApolloServer } from '@apollo/server'
 import { startServerAndCreateNextHandler } from '@as-integrations/next'
 import { gql } from 'graphql-tag'
 import { GraphQLError } from 'graphql'
+import { DateTime } from 'luxon'
 import { typeDefs } from '../../schema'
 import WeatherAPI from './dataSources/weather'
 import KeystoneAPI from './dataSources/keystone'
@@ -14,7 +15,6 @@ import clientPromise from 'lib/mongodb'
 import { getSession } from 'lib/session'
 import User from 'models/User'
 import { EXAMPLE_COLLECTION_ID } from 'constants/index'
-import { DateTime } from 'luxon'
 
 // To create a new user, we need the example collection from Keystone
 const getExampleCollection = async () => {