diff --git a/apps/dispatch/app/globals.css b/apps/dispatch/app/globals.css
index 67db6f59..876c3519 100644
--- a/apps/dispatch/app/globals.css
+++ b/apps/dispatch/app/globals.css
@@ -28,6 +28,11 @@
 	scrollbar-gutter: unset;
 }
 
+.leaflet-container:focus {
+	outline: none !important;
+	box-shadow: none !important;
+}
+
 .leaflet-popup-tip-container {
 	display: none;
 }
diff --git a/apps/hub/app/(auth)/login/_components/Login.tsx b/apps/hub/app/(auth)/login/_components/Login.tsx
index e729dabb..b6783348 100644
--- a/apps/hub/app/(auth)/login/_components/Login.tsx
+++ b/apps/hub/app/(auth)/login/_components/Login.tsx
@@ -62,53 +62,59 @@ export const Login = () => {
 					Registrierung
 				</Link>
 			</span>
-			<label className="input input-bordered flex items-center gap-2 w-full">
-				<svg
-					xmlns="http://www.w3.org/2000/svg"
-					viewBox="0 0 16 16"
-					fill="currentColor"
-					className="h-4 w-4 opacity-70"
-				>
-					<path d="M2.5 3A1.5 1.5 0 0 0 1 4.5v.793c.026.009.051.02.076.032L7.674 8.51c.206.1.446.1.652 0l6.598-3.185A.755.755 0 0 1 15 5.293V4.5A1.5 1.5 0 0 0 13.5 3h-11Z" />
-					<path d="M15 6.954 8.978 9.86a2.25 2.25 0 0 1-1.956 0L1 6.954V11.5A1.5 1.5 0 0 0 2.5 13h11a1.5 1.5 0 0 0 1.5-1.5V6.954Z" />
-				</svg>
-				<input type="text" className="grow" {...form.register("email")} placeholder="Email" />
-			</label>
-			<p className="text-error">
-				{typeof form.formState.errors.email?.message === "string"
-					? form.formState.errors.email.message
-					: ""}
-			</p>
-			<label className="input input-bordered flex items-center gap-2 mt-2 w-full">
-				<svg
-					xmlns="http://www.w3.org/2000/svg"
-					viewBox="0 0 16 16"
-					fill="currentColor"
-					className="h-4 w-4 opacity-70"
-				>
-					<path
-						fillRule="evenodd"
-						d="M14 6a4 4 0 0 1-4.899 3.899l-1.955 1.955a.5.5 0 0 1-.353.146H5v1.5a.5.5 0 0 1-.5.5h-2a.5.5 0 0 1-.5-.5v-2.293a.5.5 0 0 1 .146-.353l3.955-3.955A4 4 0 1 1 14 6Zm-4-2a.75.75 0 0 0 0 1.5.5.5 0 0 1 .5.5.75.75 0 0 0 1.5 0 2 2 0 0 0-2-2Z"
-						clipRule="evenodd"
+			<div className="alert alert-info alert-outline text-sm font-semibold text-center">
+				Du warst bereits Nutzer der V1? <br />
+				Registriere dich mit der gleichen E-Mail, um deinen Account zu übernehmen!
+			</div>
+			<div className="mt-5 mb-2">
+				<label className="input input-bordered flex items-center gap-2 w-full">
+					<svg
+						xmlns="http://www.w3.org/2000/svg"
+						viewBox="0 0 16 16"
+						fill="currentColor"
+						className="h-4 w-4 opacity-70"
+					>
+						<path d="M2.5 3A1.5 1.5 0 0 0 1 4.5v.793c.026.009.051.02.076.032L7.674 8.51c.206.1.446.1.652 0l6.598-3.185A.755.755 0 0 1 15 5.293V4.5A1.5 1.5 0 0 0 13.5 3h-11Z" />
+						<path d="M15 6.954 8.978 9.86a2.25 2.25 0 0 1-1.956 0L1 6.954V11.5A1.5 1.5 0 0 0 2.5 13h11a1.5 1.5 0 0 0 1.5-1.5V6.954Z" />
+					</svg>
+					<input type="text" className="grow" {...form.register("email")} placeholder="Email" />
+				</label>
+				<p className="text-error">
+					{typeof form.formState.errors.email?.message === "string"
+						? form.formState.errors.email.message
+						: ""}
+				</p>
+				<label className="input input-bordered flex items-center gap-2 mt-2 w-full">
+					<svg
+						xmlns="http://www.w3.org/2000/svg"
+						viewBox="0 0 16 16"
+						fill="currentColor"
+						className="h-4 w-4 opacity-70"
+					>
+						<path
+							fillRule="evenodd"
+							d="M14 6a4 4 0 0 1-4.899 3.899l-1.955 1.955a.5.5 0 0 1-.353.146H5v1.5a.5.5 0 0 1-.5.5h-2a.5.5 0 0 1-.5-.5v-2.293a.5.5 0 0 1 .146-.353l3.955-3.955A4 4 0 1 1 14 6Zm-4-2a.75.75 0 0 0 0 1.5.5.5 0 0 1 .5.5.75.75 0 0 0 1.5 0 2 2 0 0 0-2-2Z"
+							clipRule="evenodd"
+						/>
+					</svg>
+					<input
+						autoComplete="current-password"
+						type="password"
+						{...form.register("password")}
+						placeholder="Passwort"
+						className="grow"
 					/>
-				</svg>
-				<input
-					autoComplete="current-password"
-					type="password"
-					{...form.register("password")}
-					placeholder="Passwort"
-					className="grow"
-				/>
-			</label>
-			<span className="text-sm font-medium flex justify-end">
-				<Link href="/passwort-reset" className="link link-accent link-hover ">
-					Passwort vergessen?
-				</Link>
-			</span>
-			<div className="card-actions mt-6">
-				<Button disabled={isLoading} isLoading={isLoading} className="btn btn-primary btn-block">
-					Login
-				</Button>
+				</label>
+				<span className="text-sm font-medium flex justify-end">
+					<Link href="/passwort-reset" className="link link-accent link-hover ">
+						Passwort vergessen?
+					</Link>
+				</span>
+				<div className="card-actions mt-6">
+					<Button disabled={isLoading} isLoading={isLoading} className="btn btn-primary btn-block">
+						Login
+					</Button>
+				</div>
 			</div>
 		</form>
 	);
diff --git a/apps/hub/app/(auth)/login/page.tsx b/apps/hub/app/(auth)/login/page.tsx
index 2e247e5c..731b6ce7 100644
--- a/apps/hub/app/(auth)/login/page.tsx
+++ b/apps/hub/app/(auth)/login/page.tsx
@@ -1,9 +1,11 @@
-import { Login } from './_components/Login';
+import { Login } from "./_components/Login";
 
-export default async () => {
-  return (
-    <>
-      <Login />
-    </>
-  );
+const LoginPage = async () => {
+	return (
+		<>
+			<Login />
+		</>
+	);
 };
+
+export default LoginPage;
diff --git a/apps/hub/app/(auth)/register/_components/Register.tsx b/apps/hub/app/(auth)/register/_components/Register.tsx
index bf5d7001..f6e1dd91 100644
--- a/apps/hub/app/(auth)/register/_components/Register.tsx
+++ b/apps/hub/app/(auth)/register/_components/Register.tsx
@@ -94,6 +94,10 @@ export const Register = () => {
 					Login
 				</Link>
 			</span>
+			<div className="alert alert-info alert-outline text-sm font-semibold text-center">
+				Du warst bereits Nutzer der V1? <br />
+				Registriere dich mit der gleichen E-Mail, um deinen Account zu übernehmen!
+			</div>
 			<div className="mt-5 mb-2">
 				<label className="input input-bordered flex items-center gap-2 mt-2 w-full">
 					<svg
diff --git a/apps/hub/app/(auth)/register/page.tsx b/apps/hub/app/(auth)/register/page.tsx
index 7fbb5823..c5a4cbfa 100644
--- a/apps/hub/app/(auth)/register/page.tsx
+++ b/apps/hub/app/(auth)/register/page.tsx
@@ -1,9 +1,11 @@
-import { Register } from './_components/Register';
+import { Register } from "./_components/Register";
 
-export default () => {
-  return (
-    <>
-      <Register />
-    </>
-  );
+const RegisterPage = () => {
+	return (
+		<>
+			<Register />
+		</>
+	);
 };
+
+export default RegisterPage;