diff --git a/packages/backend/src/plugins/auth.ts b/packages/backend/src/plugins/auth.ts
index 3b4b2b9450..39a14139e6 100644
--- a/packages/backend/src/plugins/auth.ts
+++ b/packages/backend/src/plugins/auth.ts
@@ -35,7 +35,18 @@ export default async function createPlugin(
       ...defaultAuthProviderFactories,
       google: providers.google.create({
         signIn: {
-          resolver: providers.google.resolvers.byEmailLocalPart(),
+          resolver({ profile }, ctx) {
+            if (!profile.email) {
+              throw new Error(
+                'Login failed, user profile does not contain an email',
+              );
+            }
+            return ctx.signInWithCatalogUser({
+              entityRef: {
+                name: profile.email.split('@')[0],
+              },
+            });
+          },
         },
       }),
     },