diff --git a/api/package.json b/api/package.json
index 86a587c..6978f38 100644
--- a/api/package.json
+++ b/api/package.json
@@ -6,6 +6,7 @@
     "@redwoodjs/api": "7.7.4",
     "@redwoodjs/auth-dbauth-api": "7.7.4",
     "@redwoodjs/graphql-server": "7.7.4",
+    "graphql-scalars": "^1.23.0",
     "nodemailer": "^6.9.14"
   },
   "devDependencies": {
diff --git a/api/src/functions/graphql.ts b/api/src/functions/graphql.ts
index e9c53e2..a541807 100644
--- a/api/src/functions/graphql.ts
+++ b/api/src/functions/graphql.ts
@@ -1,3 +1,10 @@
+import {
+  CuidDefinition,
+  CuidResolver,
+  EmailAddressTypeDefinition,
+  EmailAddressResolver,
+} from 'graphql-scalars'
+
 import { createAuthDecoder } from '@redwoodjs/auth-dbauth-api'
 import { createGraphQLHandler } from '@redwoodjs/graphql-server'
 
@@ -18,6 +25,13 @@ export const handler = createGraphQLHandler({
   directives,
   sdls,
   services,
+  schemaOptions: {
+    typeDefs: [CuidDefinition, EmailAddressTypeDefinition],
+    resolvers: {
+      Cuid: CuidResolver,
+      EmailAddress: EmailAddressResolver,
+    },
+  },
   onException: () => {
     // Disconnect from your database with an unhandled exception.
     db.$disconnect()
diff --git a/api/src/graphql/scalars.sdl.ts b/api/src/graphql/scalars.sdl.ts
new file mode 100644
index 0000000..bb34c31
--- /dev/null
+++ b/api/src/graphql/scalars.sdl.ts
@@ -0,0 +1,4 @@
+export const schema = gql`
+  scalar Cuid
+  scalar EmailAddress
+`
diff --git a/api/src/graphql/users.sdl.ts b/api/src/graphql/users.sdl.ts
index 7db79bd..7d7b402 100644
--- a/api/src/graphql/users.sdl.ts
+++ b/api/src/graphql/users.sdl.ts
@@ -2,7 +2,7 @@ export const schema = gql`
   type User {
     id: Int!
     username: String!
-    email: String!
+    email: EmailAddress!
     hashedPassword: String!
     salt: String!
     resetToken: String
diff --git a/api/src/services/users/users.ts b/api/src/services/users/users.ts
index a708d87..dc80e14 100644
--- a/api/src/services/users/users.ts
+++ b/api/src/services/users/users.ts
@@ -5,32 +5,3 @@ import { db } from 'src/lib/db'
 export const userCount: QueryResolvers['userCount'] = () => {
   return db.user.count()
 }
-
-// export const users: QueryResolvers['users'] = () => {
-//   return db.user.findMany()
-// }
-
-// export const user: QueryResolvers['user'] = ({ id }) => {
-//   return db.user.findUnique({
-//     where: { id },
-//   })
-// }
-
-// export const createUser: MutationResolvers['createUser'] = ({ input }) => {
-//   return db.user.create({
-//     data: input,
-//   })
-// }
-
-// export const updateUser: MutationResolvers['updateUser'] = ({ id, input }) => {
-//   return db.user.update({
-//     data: input,
-//     where: { id },
-//   })
-// }
-
-// export const deleteUser: MutationResolvers['deleteUser'] = ({ id }) => {
-//   return db.user.delete({
-//     where: { id },
-//   })
-// }
diff --git a/web/src/pages/SignupPage/SignupPage.tsx b/web/src/pages/SignupPage/SignupPage.tsx
index 30a9c69..1af690c 100644
--- a/web/src/pages/SignupPage/SignupPage.tsx
+++ b/web/src/pages/SignupPage/SignupPage.tsx
@@ -31,8 +31,6 @@ const SignupPage = () => {
     if (!loading && data.userCount >= 1) {
       toast.error('Account already exists')
 
-      console.log('here - redirect')
-      console.log(data)
       navigate(routes.home())
     }
   }, [data, loading])
diff --git a/yarn.lock b/yarn.lock
index 442337e..d0b13af 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6970,6 +6970,7 @@ __metadata:
     "@redwoodjs/auth-dbauth-api": "npm:7.7.4"
     "@redwoodjs/graphql-server": "npm:7.7.4"
     "@types/nodemailer": "npm:^6.4.15"
+    graphql-scalars: "npm:^1.23.0"
     nodemailer: "npm:^6.9.14"
   languageName: unknown
   linkType: soft
@@ -12311,7 +12312,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"graphql-scalars@npm:1.23.0":
+"graphql-scalars@npm:1.23.0, graphql-scalars@npm:^1.23.0":
   version: 1.23.0
   resolution: "graphql-scalars@npm:1.23.0"
   dependencies: