diff --git a/src/components/Admin/EditUser/index.tsx b/src/components/Admin/EditUser/index.tsx
index 361d772ca..9bbab8a5e 100644
--- a/src/components/Admin/EditUser/index.tsx
+++ b/src/components/Admin/EditUser/index.tsx
@@ -2,7 +2,7 @@ import React from 'react';
 import clsx from 'clsx';
 import styles from './styles.module.scss';
 import { observer } from 'mobx-react-lite';
-import { Role, RoleAccessLevel, RoleNames, User as UserProps } from '@tdev-api/user';
+import { Role, RoleAccessLevel, RoleNames } from '@tdev-api/user';
 import Card from '@tdev-components/shared/Card';
 import TextInput from '@tdev-components/shared/TextInput';
 import Button from '@tdev-components/shared/Button';
diff --git a/src/models/User.ts b/src/models/User.ts
index 264a7b50d..467aef19c 100644
--- a/src/models/User.ts
+++ b/src/models/User.ts
@@ -1,7 +1,6 @@
 import { action, computed, observable } from 'mobx';
 import { AuthProvider, Role, RoleAccessLevel, User as UserProps } from '@tdev-api/user';
 import { UserStore } from '@tdev-stores/UserStore';
-import siteConfig from '@generated/docusaurus.config';
 
 export default class User {
     readonly store: UserStore;
diff --git a/src/pages/login.tsx b/src/pages/login.tsx
index d9b030a07..cbafceca9 100644
--- a/src/pages/login.tsx
+++ b/src/pages/login.tsx
@@ -30,7 +30,7 @@ const LoginPage = observer(() => {
     const { data: session } = authClient.useSession();
     const signInPage = useBaseUrl('/signIn');
     if (session?.user || NO_AUTH) {
-        return <Redirect to={'/user'} />;
+        return <Redirect to={'/'} />;
     }
     return (
         <Layout>
@@ -41,7 +41,7 @@ const LoginPage = observer(() => {
                         onClick={() =>
                             authClient.signIn.social({
                                 provider: 'microsoft',
-                                callbackURL: `${APP_URL}/user`
+                                callbackURL: APP_URL
                             })
                         }
                         text="Schul-Account"
@@ -55,7 +55,7 @@ const LoginPage = observer(() => {
                         onClick={() =>
                             authClient.signIn.social({
                                 provider: 'github',
-                                callbackURL: `${APP_URL}/user`
+                                callbackURL: APP_URL
                             })
                         }
                         text="Github"
@@ -81,7 +81,7 @@ const Login = observer(() => {
     const { data: session } = authClient.useSession();
 
     if (session?.user || NO_AUTH) {
-        return <Redirect to={'/user'} />;
+        return <Redirect to={'/'} />;
     }
     return <LoginPage />;
 });
diff --git a/src/pages/signIn/index.tsx b/src/pages/signIn/index.tsx
index 045b1299c..dd34efb95 100644
--- a/src/pages/signIn/index.tsx
+++ b/src/pages/signIn/index.tsx
@@ -3,13 +3,12 @@ import clsx from 'clsx';
 import Layout from '@theme/Layout';
 
 import styles from './styles.module.scss';
-import { useStore } from '../../hooks/useStore';
-import Button from '../../components/shared/Button';
 import { authClient } from '@site/src/auth-client';
 import { Redirect } from '@docusaurus/router';
-import useBaseUrl from '@docusaurus/useBaseUrl';
 import TextInput from '@tdev-components/shared/TextInput';
 import { observer } from 'mobx-react-lite';
+import { useStore } from '@tdev-hooks/useStore';
+import Button from '@tdev-components/shared/Button';
 
 const SignIn = observer((): React.ReactNode => {
     const [email, setEmail] = React.useState('');
@@ -17,10 +16,9 @@ const SignIn = observer((): React.ReactNode => {
     const authStore = useStore('authStore');
 
     const { data: session } = authClient.useSession();
-    const userPage = useBaseUrl('/user');
 
     if (session?.user) {
-        return <Redirect to={userPage} />;
+        return <Redirect to={'/'} />;
     }
 
     return (
diff --git a/src/pages/user/index.tsx b/src/pages/user/index.tsx
index d4a4c9fef..eeece4abb 100644
--- a/src/pages/user/index.tsx
+++ b/src/pages/user/index.tsx
@@ -6,16 +6,11 @@ import { observer } from 'mobx-react-lite';
 import { Redirect } from '@docusaurus/router';
 import {
     mdiArrowRightThin,
-    mdiBackupRestore,
     mdiCircle,
     mdiCloudQuestion,
     mdiDeleteEmptyOutline,
     mdiHarddiskRemove,
-    mdiLogout,
-    mdiMoonWaxingCrescent,
-    mdiRefresh,
-    mdiThemeLightDark,
-    mdiWhiteBalanceSunny
+    mdiLogout
 } from '@mdi/js';
 import siteConfig from '@generated/docusaurus.config';
 import { useStore } from '@tdev-hooks/useStore';
@@ -23,11 +18,8 @@ import Button from '@tdev-components/shared/Button';
 import Loader from '@tdev-components/Loader';
 import DefinitionList from '@tdev-components/DefinitionList';
 import Icon from '@mdi/react';
-import UserTable from '@tdev-components/Admin/UserTable';
 import NavReloadRequest from '@tdev-components/Admin/ActionRequest/NavReloadRequest';
-import Storage from '@tdev-stores/utils/Storage';
-import { AuthProviderColor, AuthProviderIcons, logout } from '@tdev-api/user';
-import SelectInput from '@tdev-components/shared/SelectInput';
+import { AuthProviderColor, AuthProviderIcons } from '@tdev-api/user';
 import useIsBrowser from '@docusaurus/useIsBrowser';
 import { useIsLive } from '@tdev-hooks/useIsLive';
 import Badge from '@tdev-components/shared/Badge';
@@ -35,7 +27,6 @@ import { SIZE_M, SIZE_XS } from '@tdev-components/shared/iconSizes';
 import { Confirm } from '@tdev-components/shared/Button/Confirm';
 import api from '@tdev-api/base';
 import { authClient } from '@tdev/auth-client';
-import useCodeTheme from '@tdev-hooks/useCodeTheme';
 import CodeThemeToggle from '@tdev-components/util/CodeThemeToggle';
 
 const { NO_AUTH, OFFLINE_API, TEST_USER } = siteConfig.customFields as {