diff --git a/packages/web/src/components/LoginForm/index.tsx b/packages/web/src/components/LoginForm/index.tsx
index 64759980..b2354c31 100644
--- a/packages/web/src/components/LoginForm/index.tsx
+++ b/packages/web/src/components/LoginForm/index.tsx
@@ -51,9 +51,8 @@ function renderFields(props: { loading: boolean }) {
           Login
         </LoadingButton>
 
-        
-        <Typography variant="body1" align='center' mt={3}>
-          Don't have an Automatisch account yet? 
+        <Typography variant="body1" align="center" mt={3}>
+          Don't have an Automatisch account yet?
           <Link to={URLS.SIGNUP}>Sign Up</Link>
         </Typography>
       </>
diff --git a/packages/web/src/components/SignUpForm/index.ee.tsx b/packages/web/src/components/SignUpForm/index.ee.tsx
index 1f95ee08..b2a85370 100644
--- a/packages/web/src/components/SignUpForm/index.ee.tsx
+++ b/packages/web/src/components/SignUpForm/index.ee.tsx
@@ -8,10 +8,11 @@ import * as yup from 'yup';
 
 import useAuthentication from 'hooks/useAuthentication';
 import * as URLS from 'config/urls';
-import { LOGIN } from 'graphql/mutations/login';
+import { CREATE_USER } from 'graphql/mutations/create-user.ee';
 import Form from 'components/Form';
 import TextField from 'components/TextField';
 import { yupResolver } from '@hookform/resolvers/yup';
+import { LOGIN } from 'graphql/mutations/login';
 
 const validationSchema = yup.object().shape({
   fullName: yup.string().required(),
@@ -33,6 +34,7 @@ const initialValue = {
 function SignUpForm() {
   const navigate = useNavigate();
   const authentication = useAuthentication();
+  const [createUser] = useMutation(CREATE_USER);
   const [login, { loading }] = useMutation(LOGIN);
 
   React.useEffect(() => {
@@ -42,9 +44,16 @@ function SignUpForm() {
   }, [authentication.isAuthenticated]);
 
   const handleSubmit = async (values: any) => {
+    const { fullName, email, password } = values;
+    await createUser({
+      variables: {
+        input: { fullName, email, password },
+      },
+    });
+
     const { data } = await login({
       variables: {
-        input: values,
+        input: { email, password },
       },
     });
 
@@ -53,8 +62,6 @@ function SignUpForm() {
     authentication.updateToken(token);
   };
 
-  //const render = React.useMemo(() => renderFields({ loading }), [loading]);
-
   return (
     <Paper sx={{ px: 2, py: 4 }}>
       <Typography
diff --git a/packages/web/src/graphql/mutations/create-user.ee.ts b/packages/web/src/graphql/mutations/create-user.ee.ts
new file mode 100644
index 00000000..5dc9f419
--- /dev/null
+++ b/packages/web/src/graphql/mutations/create-user.ee.ts
@@ -0,0 +1,10 @@
+import { gql } from '@apollo/client';
+
+export const CREATE_USER = gql`
+  mutation CreateUser($input: CreateUserInput) {
+    createUser(input: $input) {
+      email
+      fullName
+    }
+  }
+`;