diff --git a/src/__tests__/components/loginForm.test.tsx b/src/__tests__/components/loginForm.test.tsx
index ddc07f3f..8b501d86 100644
--- a/src/__tests__/components/loginForm.test.tsx
+++ b/src/__tests__/components/loginForm.test.tsx
@@ -1,10 +1,12 @@
 import { render, screen, fireEvent, waitFor } from "@testing-library/react";
 import userEvent from "@testing-library/user-event";
 import { signIn } from "next-auth/react";
+import { NextIntlClientProvider } from "next-intl";
 import { useRouter } from "next/router";
 import { toast } from "react-hot-toast";
 import CredentialsForm from "~/components/auth/credentialsForm";
 import { ErrorCode } from "~/utils/errorCode";
+import enTranslation from "~/locales/en/common.json";
 
 jest.mock("next-auth/react", () => ({
 	signIn: jest.fn(),
@@ -20,6 +22,14 @@ jest.mock("react-hot-toast", () => ({
 	},
 }));
 
+const renderWithIntl = (ui, { locale = "en", messages = enTranslation } = {}) => {
+	return render(
+		<NextIntlClientProvider locale={locale} messages={messages}>
+			{ui}
+		</NextIntlClientProvider>,
+	);
+};
+
 describe("CredentialsForm", () => {
 	beforeEach(() => {
 		(signIn as jest.Mock).mockReset();
@@ -28,7 +38,7 @@ describe("CredentialsForm", () => {
 	});
 
 	it("updates email and password inputs on change", () => {
-		render(<CredentialsForm />);
+		renderWithIntl(<CredentialsForm />);
 
 		const emailInput = screen.getByPlaceholderText("mail@example.com");
 		const passwordInput = screen.getByPlaceholderText("Enter your password");
@@ -41,7 +51,7 @@ describe("CredentialsForm", () => {
 	});
 
 	it("submits the form with correct email and password", async () => {
-		render(<CredentialsForm />);
+		renderWithIntl(<CredentialsForm />);
 
 		(signIn as jest.Mock).mockResolvedValue({ ok: true });
 
@@ -62,7 +72,7 @@ describe("CredentialsForm", () => {
 	});
 
 	it("shows TOTP input when second factor is required", async () => {
-		render(<CredentialsForm />);
+		renderWithIntl(<CredentialsForm />);
 
 		(signIn as jest.Mock).mockResolvedValue({ error: ErrorCode.SecondFactorRequired });
 
@@ -80,7 +90,7 @@ describe("CredentialsForm", () => {
 	});
 
 	it("handles error response from signIn", async () => {
-		render(<CredentialsForm />);
+		renderWithIntl(<CredentialsForm />);
 
 		const errorMessage = "Invalid credentials";
 		(signIn as jest.Mock).mockResolvedValue({ ok: false, error: errorMessage });
@@ -102,7 +112,7 @@ describe("CredentialsForm", () => {
 		const mockPush = jest.fn();
 		(useRouter as jest.Mock).mockReturnValue({ push: mockPush });
 
-		render(<CredentialsForm />);
+		renderWithIntl(<CredentialsForm />);
 
 		(signIn as jest.Mock).mockResolvedValue({ ok: true });
 
@@ -120,7 +130,7 @@ describe("CredentialsForm", () => {
 	});
 
 	it("handles network errors", async () => {
-		render(<CredentialsForm />);
+		renderWithIntl(<CredentialsForm />);
 
 		const errorMessage = "Network error";
 		(signIn as jest.Mock).mockRejectedValue(new Error(errorMessage));
diff --git a/src/components/auth/credentialsForm.tsx b/src/components/auth/credentialsForm.tsx
index e16b8dbb..937f61f9 100644
--- a/src/components/auth/credentialsForm.tsx
+++ b/src/components/auth/credentialsForm.tsx
@@ -7,6 +7,7 @@ import Link from "next/link";
 import TOTPInput from "./totpInput";
 import FormSubmitButtons from "./formSubmitButton";
 import FormInput from "./formInput";
+import { useTranslations } from "next-intl";
 
 interface FormData {
 	email: string;
@@ -16,7 +17,7 @@ interface FormData {
 
 const CredentialsForm: React.FC = () => {
 	const router = useRouter();
-
+	const t = useTranslations();
 	const [totpCode, setTotpCode] = useState("");
 	const [showOTP, setShowOTP] = useState<boolean>(false);
 	const [loading, setLoading] = useState({ credentials: false, oauth: false });
@@ -68,12 +69,12 @@ const CredentialsForm: React.FC = () => {
 			{!showOTP && (
 				<>
 					<FormInput
-						label="Email"
+						label={t("authPages.form.email")}
 						name="email"
 						type="email"
 						value={formData.email}
 						onChange={handleChange}
-						placeholder="mail@example.com"
+						placeholder={t("authPages.form.emailPlaceholder")}
 						icon={
 							<svg
 								xmlns="http://www.w3.org/2000/svg"
@@ -87,12 +88,12 @@ const CredentialsForm: React.FC = () => {
 						}
 					/>
 					<FormInput
-						label="Password"
+						label={t("authPages.form.password")}
 						name="password"
 						type="password"
 						value={formData.password}
 						onChange={handleChange}
-						placeholder="Enter your password"
+						placeholder={t("authPages.form.passwordPlaceholder")}
 						icon={
 							<svg
 								xmlns="http://www.w3.org/2000/svg"
@@ -114,7 +115,7 @@ const CredentialsForm: React.FC = () => {
 								href="/auth/forgotPassword"
 								className="cursor-pointer text-blue-500  hover:text-blue-700"
 							>
-								Forgot your password?
+								{t("authPages.form.forgotPassword")}
 							</Link>
 						</div>
 					</div>
@@ -124,7 +125,7 @@ const CredentialsForm: React.FC = () => {
 			<div className="pt-5">
 				<FormSubmitButtons
 					loading={loading.credentials}
-					title={showOTP ? "Verify TOTP" : "Sign in"}
+					title={showOTP ? t("authPages.form.verify2FA") : t("authPages.form.signIn")}
 				/>
 			</div>
 		</form>
diff --git a/src/components/auth/forgotPasswordForm.tsx b/src/components/auth/forgotPasswordForm.tsx
index 5be6721a..af2c808d 100644
--- a/src/components/auth/forgotPasswordForm.tsx
+++ b/src/components/auth/forgotPasswordForm.tsx
@@ -4,12 +4,14 @@ import { toast } from "react-hot-toast";
 import { useTrpcApiErrorHandler } from "~/hooks/useTrpcApiHandler";
 import FormInput from "./formInput";
 import FormSubmitButtons from "./formSubmitButton";
+import { useTranslations } from "next-intl";
 
 interface FormData {
 	email: string;
 }
 
 const ForgotPasswordForm: React.FC = () => {
+	const t = useTranslations();
 	const [loading, setLoading] = useState(false);
 	const [formData, setFormData] = useState<FormData>({
 		email: "",
@@ -47,12 +49,12 @@ const ForgotPasswordForm: React.FC = () => {
 	return (
 		<form className="space-y-5" onSubmit={submitHandler}>
 			<FormInput
-				label="Email"
+				label={t("authPages.form.email")}
 				name="email"
 				type="text"
 				value={formData.email}
 				onChange={handleChange}
-				placeholder="mail@example.com"
+				placeholder={t("authPages.form.emailPlaceholder")}
 				icon={
 					<svg
 						xmlns="http://www.w3.org/2000/svg"
@@ -66,7 +68,7 @@ const ForgotPasswordForm: React.FC = () => {
 				}
 			/>
 			<div className="pt-5">
-				<FormSubmitButtons loading={loading} title="Send Email" />
+				<FormSubmitButtons loading={loading} title={t("authPages.form.sendMail")} />
 			</div>
 		</form>
 	);
diff --git a/src/components/auth/mfaRecoveryForm.tsx b/src/components/auth/mfaRecoveryForm.tsx
index 39df5575..201c391d 100644
--- a/src/components/auth/mfaRecoveryForm.tsx
+++ b/src/components/auth/mfaRecoveryForm.tsx
@@ -4,12 +4,14 @@ import { toast } from "react-hot-toast";
 import { useTrpcApiErrorHandler } from "~/hooks/useTrpcApiHandler";
 import FormInput from "./formInput";
 import FormSubmitButtons from "./formSubmitButton";
+import { useTranslations } from "next-intl";
 
 interface FormData {
 	email: string;
 }
 
 const MfaRecoveryForm: React.FC = () => {
+	const t = useTranslations();
 	const [loading, setLoading] = useState(false);
 
 	const [formData, setFormData] = useState<FormData>({
@@ -47,12 +49,12 @@ const MfaRecoveryForm: React.FC = () => {
 	return (
 		<form className="space-y-5" onSubmit={submitHandler}>
 			<FormInput
-				label="Email"
+				label={t("authPages.form.email")}
 				name="email"
 				type="email"
 				value={formData.email}
 				onChange={handleChange}
-				placeholder="mail@example.com"
+				placeholder={t("authPages.form.emailPlaceholder")}
 				icon={
 					<svg
 						xmlns="http://www.w3.org/2000/svg"
@@ -67,7 +69,7 @@ const MfaRecoveryForm: React.FC = () => {
 			/>
 
 			<div className="pt-5">
-				<FormSubmitButtons loading={loading} title="Send Email" />
+				<FormSubmitButtons loading={loading} title={t("authPages.form.sendMail")} />
 			</div>
 		</form>
 	);
diff --git a/src/components/auth/oauthLogin.tsx b/src/components/auth/oauthLogin.tsx
index 8183d6e8..98e2e9df 100644
--- a/src/components/auth/oauthLogin.tsx
+++ b/src/components/auth/oauthLogin.tsx
@@ -3,6 +3,7 @@ import { useRouter } from "next/router";
 import { useState, useEffect } from "react";
 import { toast } from "react-hot-toast";
 import cn from "classnames";
+import { useTranslations } from "next-intl";
 
 interface OAuthProvider {
 	id: string;
@@ -13,6 +14,7 @@ interface OAuthProvider {
 }
 
 const OAuthLogin: React.FC = () => {
+	const t = useTranslations();
 	const router = useRouter();
 	const [loading, setLoading] = useState(false);
 	const [providers, setProviders] = useState<Record<string, OAuthProvider>>({});
@@ -70,7 +72,9 @@ const OAuthLogin: React.FC = () => {
 					disabled={loading}
 				>
 					{loading ? <span className="loading loading-spinner"></span> : null}
-					Sign in with {provider.name}
+					{t("authPages.form.signInWith", {
+						provider: provider.name,
+					})}
 				</button>
 			))}
 		</div>
diff --git a/src/components/auth/registerForm.tsx b/src/components/auth/registerForm.tsx
index 50bb9729..94701c15 100644
--- a/src/components/auth/registerForm.tsx
+++ b/src/components/auth/registerForm.tsx
@@ -5,6 +5,7 @@ import { api } from "~/utils/api";
 import { useTrpcApiErrorHandler } from "~/hooks/useTrpcApiHandler";
 import FormInput from "./formInput";
 import FormSubmitButtons from "./formSubmitButton";
+import { useTranslations } from "next-intl";
 interface FormData {
 	email: string;
 	password: string;
@@ -14,6 +15,7 @@ interface FormData {
 }
 
 const RegisterForm: React.FC = () => {
+	const t = useTranslations();
 	const router = useRouter();
 	const { invite } = router.query as { invite?: string };
 
@@ -63,21 +65,21 @@ const RegisterForm: React.FC = () => {
 		<form className="space-y-5" onSubmit={submitHandler}>
 			{invite && (
 				<FormInput
-					label="Code"
+					label={t("authPages.form.invitationCode")}
 					name="ztnetInvitationCode"
 					type="text"
 					value={formData.ztnetInvitationCode}
 					onChange={handleChange}
-					placeholder="Invitation code"
+					placeholder={t("authPages.form.invitationCodePlaceholder")}
 				/>
 			)}
 			<FormInput
-				label="Name"
+				label={t("authPages.form.name")}
 				name="name"
 				type="text"
 				value={formData.name}
 				onChange={handleChange}
-				placeholder="First & Last Name"
+				placeholder={t("authPages.form.namePlaceholder")}
 				icon={
 					<svg
 						xmlns="http://www.w3.org/2000/svg"
@@ -90,12 +92,12 @@ const RegisterForm: React.FC = () => {
 				}
 			/>
 			<FormInput
-				label="Email"
+				label={t("authPages.form.email")}
 				name="email"
 				type="email"
 				value={formData.email}
 				onChange={handleChange}
-				placeholder="mail@example.com"
+				placeholder={t("authPages.form.emailPlaceholder")}
 				icon={
 					<svg
 						xmlns="http://www.w3.org/2000/svg"
@@ -109,12 +111,12 @@ const RegisterForm: React.FC = () => {
 				}
 			/>
 			<FormInput
-				label="Password"
+				label={t("authPages.form.password")}
 				name="password"
 				type="password"
 				value={formData.password}
 				onChange={handleChange}
-				placeholder="Enter your password"
+				placeholder={t("authPages.form.passwordPlaceholder")}
 				icon={
 					<svg
 						xmlns="http://www.w3.org/2000/svg"
@@ -131,7 +133,7 @@ const RegisterForm: React.FC = () => {
 				}
 			/>
 			<div className="pt-5">
-				<FormSubmitButtons loading={loading} title="Sign Up" />
+				<FormSubmitButtons loading={loading} title={t("authPages.form.signUp")} />
 			</div>
 		</form>
 	);
diff --git a/src/components/auth/registerOrganizationInvite.tsx b/src/components/auth/registerOrganizationInvite.tsx
index 6434c877..a8a6e599 100644
--- a/src/components/auth/registerOrganizationInvite.tsx
+++ b/src/components/auth/registerOrganizationInvite.tsx
@@ -6,6 +6,7 @@ import { toast } from "react-hot-toast";
 import { Organization, Role, User } from "@prisma/client";
 import FormSubmitButtons from "./formSubmitButton";
 import FormInput from "./formInput";
+import { useTranslations } from "next-intl";
 
 interface FormData {
 	email: string;
@@ -33,6 +34,7 @@ interface Iprops {
 const RegisterOrganizationInviteForm: React.FC<Iprops> = ({
 	organizationInvite,
 }: Iprops) => {
+	const t = useTranslations();
 	const router = useRouter();
 
 	const [loading, setLoading] = useState(false);
@@ -135,13 +137,13 @@ const RegisterOrganizationInviteForm: React.FC<Iprops> = ({
 		<form className="space-y-5" onSubmit={submitHandler}>
 			{organizationInvite ? (
 				<FormInput
-					label="Inviation Token"
+					label={t("authPages.form.invitationCode")}
 					name="ztnetToken"
 					type="text"
 					disabled
 					value={formData.ztnetOrganizationToken}
 					onChange={handleChange}
-					placeholder="token"
+					placeholder={t("authPages.form.invitationCodePlaceholder")}
 					icon={
 						<svg
 							xmlns="http://www.w3.org/2000/svg"
@@ -161,12 +163,12 @@ const RegisterOrganizationInviteForm: React.FC<Iprops> = ({
 				/>
 			) : null}
 			<FormInput
-				label="Name"
+				label={t("authPages.form.name")}
 				name="name"
 				type="text"
 				value={formData.name}
 				onChange={handleChange}
-				placeholder="First & Last Name"
+				placeholder={t("authPages.form.namePlaceholder")}
 				icon={
 					<svg
 						xmlns="http://www.w3.org/2000/svg"
@@ -179,12 +181,12 @@ const RegisterOrganizationInviteForm: React.FC<Iprops> = ({
 				}
 			/>
 			<FormInput
-				label="Email"
+				label={t("authPages.form.email")}
 				name="email"
 				type="email"
 				value={formData.email}
 				onChange={handleChange}
-				placeholder="mail@example.com"
+				placeholder={t("authPages.form.emailPlaceholder")}
 				icon={
 					<svg
 						xmlns="http://www.w3.org/2000/svg"
@@ -198,12 +200,12 @@ const RegisterOrganizationInviteForm: React.FC<Iprops> = ({
 				}
 			/>
 			<FormInput
-				label="Password"
+				label={t("authPages.form.password")}
 				name="password"
 				type="password"
 				value={formData.password}
 				onChange={handleChange}
-				placeholder="Enter your password"
+				placeholder={t("authPages.form.passwordPlaceholder")}
 				icon={
 					<svg
 						xmlns="http://www.w3.org/2000/svg"
@@ -220,7 +222,7 @@ const RegisterOrganizationInviteForm: React.FC<Iprops> = ({
 				}
 			/>
 			<div className="pt-5">
-				<FormSubmitButtons loading={loading} title="Sign Up" />
+				<FormSubmitButtons loading={loading} title={t("authPages.form.signUp")} />
 			</div>
 		</form>
 	);
diff --git a/src/components/auth/totpInput.tsx b/src/components/auth/totpInput.tsx
index f0f3962f..4bbb338e 100644
--- a/src/components/auth/totpInput.tsx
+++ b/src/components/auth/totpInput.tsx
@@ -1,20 +1,29 @@
 import React from "react";
 import TwoFactAuth from "./totpDigits";
 import Link from "next/link";
+import { useTranslations } from "next-intl";
 
 interface TOTPInputProps {
 	totpCode: string;
 	setTotpCode: (code: string) => void;
 }
 
-const TOTPInput: React.FC<TOTPInputProps> = ({ totpCode, setTotpCode }) => (
-	<div className="space-y-2">
-		<label className="text-sm font-medium tracking-wide">Enter 2FA Code</label>
-		<TwoFactAuth value={totpCode} onChange={(val) => setTotpCode(val)} />
-		<Link href="/auth/mfaRecovery" className="text-sm text-blue-500 hover:text-blue-700">
-			Having problems?
-		</Link>
-	</div>
-);
+const TOTPInput: React.FC<TOTPInputProps> = ({ totpCode, setTotpCode }) => {
+	const t = useTranslations();
+	return (
+		<div className="space-y-2">
+			<label className="text-sm font-medium tracking-wide">
+				{t("authPages.form.enter2FAcode")}
+			</label>
+			<TwoFactAuth value={totpCode} onChange={(val) => setTotpCode(val)} />
+			<Link
+				href="/auth/mfaRecovery"
+				className="text-sm text-blue-500 hover:text-blue-700"
+			>
+				{t("authPages.signin.havingIssues")}
+			</Link>
+		</div>
+	);
+};
 
 export default TOTPInput;
diff --git a/src/components/auth/welcomeMessage.tsx b/src/components/auth/welcomeMessage.tsx
index 27b2fb54..8ab2fc1c 100644
--- a/src/components/auth/welcomeMessage.tsx
+++ b/src/components/auth/welcomeMessage.tsx
@@ -1,8 +1,10 @@
 import { api } from "~/utils/api";
 import ZtnetLogo from "docs/images/logo/ztnet_200x178.png";
 import Link from "next/link";
+import { useTranslations } from "next-intl";
 
 export const WelcomeMessage = () => {
+	const t = useTranslations();
 	const { data: options, isLoading } = api.public.getWelcomeMessage.useQuery();
 
 	return (
@@ -39,12 +41,7 @@ export const WelcomeMessage = () => {
 						</div>
 						<p className="pr-3">
 							{options?.welcomeMessageBody || (
-								<span>
-									ZeroTier VPN is your key to boundless connectivity and ultimate privacy.
-									Experience a secure and borderless digital world, free from limitations.
-									Empower yourself with unmatched performance, while safeguarding your
-									data.
-								</span>
+								<span>{t("authPages.welcomeMessage.slogan")}</span>
 							)}
 						</p>
 					</div>
diff --git a/src/locales/en/common.json b/src/locales/en/common.json
index cf9c9b4f..6f112b28 100644
--- a/src/locales/en/common.json
+++ b/src/locales/en/common.json
@@ -135,6 +135,57 @@
 		"user-settings": "User Settings",
 		"logout": "Logout"
 	},
+	"authPages": {
+		"welcomeMessage": {
+			"slogan": "ZeroTier VPN lets you connect your devices securely and privately across the internet, no matter where you are. Enjoy fast and reliable connections without the usual barriers, keeping your data safe and accessible."
+		},
+		"form": {
+			"name": "Name",
+			"namePlaceholder": "Enter your name",
+			"email": "Email",
+			"emailPlaceholder": "mail@example.com",
+			"password": "Password",
+			"passwordPlaceholder": "Enter your password",
+			"forgotPassword": "Forgot your password?",
+			"verify2FA": "Verify 2FA",
+			"enter2FAcode": "Enter 2FA Code",
+			"signIn": "Sign in",
+			"signInWith": "Sign in with {provider}",
+			"signUp": "Sign up",
+			"invitationCode": "Invitation code",
+			"invitationCodePlaceholder": "Enter your invitation code",
+			"sendMail": "Send Mail",
+			"mfaRecoveryCode": "Recovery Code",
+			"mfaRecoveryCodePlaceholder": "Enter your recovery code"
+		},
+		"signin": {
+			"signInToAccount": "Sign in to your account",
+			"or": "OR",
+			"dontHaveAccount": "Don't have an account?",
+			"getStarted": "Get Started!",
+			"havingIssues": "Having issues?"
+		},
+		"signup": {
+			"signUpWithCredentials": "Create an account",
+			"haveAnAccount": "Have an account?",
+			"login": "Login!"
+		},
+		"forgot": {
+			"forgotPasswordTitle": "Forgot Password",
+			"forgotPasswordMessage": "We will send you a reset link if the account exists",
+			"backToLogin": "Back to Login"
+		},
+		"mfaRecovery": {
+			"mfaRecoveryTitle": "2FA Recovery",
+			"mfaRecoveryMessage": "We will send you instructions on how to recover your account",
+			"backToLogin": "Back to Login"
+		},
+		"mfaRecoveryReset": {
+			"mfaRecoveryResetTitle": "2FA Recovery",
+			"mfaRecoveryResetMessage": "Please enter your credentials and Recovery Code",
+			"backToLogin": "Back to Login"
+		}
+	},
 	"networks": {
 		"loading": "Loading",
 		"title": "Networks",
diff --git a/src/locales/es/common.json b/src/locales/es/common.json
index 48e592b3..7cfc840c 100644
--- a/src/locales/es/common.json
+++ b/src/locales/es/common.json
@@ -135,6 +135,57 @@
 		"user-settings": "Ajustes de usuario",
 		"logout": "Cerrar sesión"
 	},
+	"authPages": {
+		"welcomeMessage": {
+			"slogan": "ZeroTier VPN te permite conectar tus dispositivos de manera segura y privada a través de internet, sin importar dónde estés. Disfruta de conexiones rápidas y fiables sin las barreras habituales, manteniendo tus datos seguros y accesibles."
+		},
+		"form": {
+			"name": "Nombre",
+			"namePlaceholder": "Introduce tu nombre",
+			"email": "Correo electrónico",
+			"emailPlaceholder": "correo@ejemplo.com",
+			"password": "Contraseña",
+			"passwordPlaceholder": "Introduce tu contraseña",
+			"forgotPassword": "¿Olvidaste tu contraseña?",
+			"verify2FA": "Verificar 2FA",
+			"enter2FAcode": "Introduce el código 2FA",
+			"signIn": "Iniciar sesión",
+			"signInWith": "Inicia sesión con {provider}",
+			"signUp": "Regístrate",
+			"invitationCode": "Código de invitación",
+			"invitationCodePlaceholder": "Introduce tu código de invitación",
+			"sendMail": "Enviar correo",
+			"mfaRecoveryCode": "Código de recuperación",
+			"mfaRecoveryCodePlaceholder": "Introduce tu código de recuperación"
+		},
+		"signin": {
+			"signInToAccount": "Inicia sesión en tu cuenta",
+			"or": "O",
+			"dontHaveAccount": "¿No tienes una cuenta?",
+			"getStarted": "¡Comienza ahora!",
+			"havingIssues": "¿Tienes problemas?"
+		},
+		"signup": {
+			"signUpWithCredentials": "Crea una cuenta",
+			"haveAnAccount": "¿Tienes una cuenta?",
+			"login": "¡Inicia sesión!"
+		},
+		"forgot": {
+			"forgotPasswordTitle": "¿Olvidaste tu contraseña?",
+			"forgotPasswordMessage": "Te enviaremos un enlace de restablecimiento si la cuenta existe",
+			"backToLogin": "Volver al inicio de sesión"
+		},
+		"mfaRecovery": {
+			"mfaRecoveryTitle": "Recuperación de 2FA",
+			"mfaRecoveryMessage": "Te enviaremos instrucciones sobre cómo recuperar tu cuenta",
+			"backToLogin": "Volver al inicio de sesión"
+		},
+		"mfaRecoveryReset": {
+			"mfaRecoveryResetTitle": "Recuperación de 2FA",
+			"mfaRecoveryResetMessage": "Por favor, introduce tus credenciales y el código de recuperación",
+			"backToLogin": "Volver al inicio de sesión"
+		}
+	},
 	"networks": {
 		"loading": "Cargando",
 		"title": "Redes",
diff --git a/src/locales/fr/common.json b/src/locales/fr/common.json
index b74afafe..fe2b3629 100644
--- a/src/locales/fr/common.json
+++ b/src/locales/fr/common.json
@@ -135,6 +135,57 @@
 		"user-settings": "Mes réglages",
 		"logout": "Se déconnecter"
 	},
+	"authPages": {
+		"welcomeMessage": {
+			"slogan": "ZeroTier VPN vous permet de connecter vos appareils de manière sécurisée et privée sur Internet, où que vous soyez. Profitez de connexions rapides et fiables sans les barrières habituelles, tout en gardant vos données en sécurité et accessibles."
+		},
+		"form": {
+			"name": "Nom",
+			"namePlaceholder": "Entrez votre nom",
+			"email": "E-mail",
+			"emailPlaceholder": "mail@exemple.com",
+			"password": "Mot de passe",
+			"passwordPlaceholder": "Entrez votre mot de passe",
+			"forgotPassword": "Mot de passe oublié ?",
+			"verify2FA": "Vérifier 2FA",
+			"enter2FAcode": "Entrez le code 2FA",
+			"signIn": "Se connecter",
+			"signInWith": "Se connecter avec {provider}",
+			"signUp": "S'inscrire",
+			"invitationCode": "Code d'invitation",
+			"invitationCodePlaceholder": "Entrez votre code d'invitation",
+			"sendMail": "Envoyer le mail",
+			"mfaRecoveryCode": "Code de récupération",
+			"mfaRecoveryCodePlaceholder": "Entrez votre code de récupération"
+		},
+		"signin": {
+			"signInToAccount": "Connectez-vous à votre compte",
+			"or": "OU",
+			"dontHaveAccount": "Vous n'avez pas de compte?",
+			"getStarted": "Commencez!",
+			"havingIssues": "Vous avez des problèmes?"
+		},
+		"signup": {
+			"signUpWithCredentials": "Créer un compte",
+			"haveAnAccount": "Vous avez un compte?",
+			"login": "Connectez-vous!"
+		},
+		"forgot": {
+			"forgotPasswordTitle": "Mot de passe oublié",
+			"forgotPasswordMessage": "Nous vous enverrons un lien de réinitialisation si le compte existe",
+			"backToLogin": "Retour à la connexion"
+		},
+		"mfaRecovery": {
+			"mfaRecoveryTitle": "Récupération 2FA",
+			"mfaRecoveryMessage": "Nous vous enverrons des instructions pour récupérer votre compte",
+			"backToLogin": "Retour à la connexion"
+		},
+		"mfaRecoveryReset": {
+			"mfaRecoveryResetTitle": "Récupération 2FA",
+			"mfaRecoveryResetMessage": "Veuillez entrer vos identifiants et le code de récupération",
+			"backToLogin": "Retour à la connexion"
+		}
+	},
 	"networks": {
 		"loading": "Chargement",
 		"title": "Réseaux",
diff --git a/src/locales/no/common.json b/src/locales/no/common.json
index c5e2e2b0..2208dcbc 100644
--- a/src/locales/no/common.json
+++ b/src/locales/no/common.json
@@ -135,6 +135,57 @@
 		"user-settings": "Brukerinnstillinger",
 		"logout": "Logg ut"
 	},
+	"authPages": {
+		"welcomeMessage": {
+			"slogan": "ZeroTier VPN lar deg koble til enhetene dine sikkert og privat over internett, uansett hvor du er. Nyt raske og pålitelige tilkoblinger uten de vanlige barrierene, samtidig som dine data forblir trygge og tilgjengelige."
+		},
+		"form": {
+			"name": "Navn",
+			"namePlaceholder": "Skriv inn navnet ditt",
+			"email": "E-post",
+			"emailPlaceholder": "mail@eksempel.com",
+			"password": "Passord",
+			"passwordPlaceholder": "Skriv inn passordet ditt",
+			"forgotPassword": "Glemt passordet ditt?",
+			"verify2FA": "Bekreft 2FA",
+			"enter2FAcode": "Skriv inn 2FA-koden",
+			"signIn": "Logg inn",
+			"signInWith": "Logg inn med {provider}",
+			"signUp": "Opprett konto",
+			"invitationCode": "Invitasjonskode",
+			"invitationCodePlaceholder": "Skriv inn invitasjonskoden din",
+			"sendMail": "Send e-post",
+			"mfaRecoveryCode": "Gjenopprettingskode",
+			"mfaRecoveryCodePlaceholder": "Skriv inn gjenopprettingskoden din"
+		},
+		"signin": {
+			"signInToAccount": "Logg inn på kontoen din",
+			"or": "ELLER",
+			"dontHaveAccount": "Har du ikke en konto?",
+			"getStarted": "Kom i gang!",
+			"havingIssues": "Har du problemer?"
+		},
+		"signup": {
+			"signUpWithCredentials": "Opprett en brukerkonto",
+			"haveAnAccount": "Har du en konto?",
+			"login": "Logg inn!"
+		},
+		"forgot": {
+			"forgotPasswordTitle": "Glemt passord",
+			"forgotPasswordMessage": "Vi sender deg en tilbakestillingslenke hvis kontoen eksisterer",
+			"backToLogin": "Tilbake til innlogging"
+		},
+		"mfaRecovery": {
+			"mfaRecoveryTitle": "Gjenoppretting av 2FA",
+			"mfaRecoveryMessage": "Vi vil sende deg instruksjoner om hvordan du gjenoppretter kontoen din",
+			"backToLogin": "Tilbake til innlogging"
+		},
+		"mfaRecoveryReset": {
+			"mfaRecoveryResetTitle": "Gjenoppretting av 2FA",
+			"mfaRecoveryResetMessage": "Vennligst skriv inn dine legitimasjonsbeskrivelser og gjenopprettingskode",
+			"backToLogin": "Tilbake til innlogging"
+		}
+	},
 	"networks": {
 		"loading": "Laster",
 		"title": "Nettverk",
diff --git a/src/locales/pl/common.json b/src/locales/pl/common.json
index 772e64c1..cd71e665 100644
--- a/src/locales/pl/common.json
+++ b/src/locales/pl/common.json
@@ -135,6 +135,57 @@
 		"user-settings": "Ustawienia konta",
 		"logout": "Wyloguj"
 	},
+	"authPages": {
+		"welcomeMessage": {
+			"slogan": "ZeroTier VPN umożliwia bezpieczne i prywatne połączenie urządzeń przez internet, bez względu na to, gdzie się znajdujesz. Ciesz się szybkimi i niezawodnymi połączeniami bez zwykłych barier, zachowując bezpieczeństwo i dostępność danych."
+		},
+		"form": {
+			"name": "Imię",
+			"namePlaceholder": "Wpisz swoje imię",
+			"email": "Email",
+			"emailPlaceholder": "mail@przyklad.com",
+			"password": "Hasło",
+			"passwordPlaceholder": "Wpisz swoje hasło",
+			"forgotPassword": "Zapomniałeś hasła?",
+			"verify2FA": "Zweryfikuj 2FA",
+			"enter2FAcode": "Wpisz kod 2FA",
+			"signIn": "Zaloguj się",
+			"signInWith": "Zaloguj się za pomocą {provider}",
+			"signUp": "Zarejestruj się",
+			"invitationCode": "Kod zaproszenia",
+			"invitationCodePlaceholder": "Wpisz swój kod zaproszenia",
+			"sendMail": "Wyślij maila",
+			"mfaRecoveryCode": "Kod odzyskiwania",
+			"mfaRecoveryCodePlaceholder": "Wpisz swój kod odzyskiwania"
+		},
+		"signin": {
+			"signInToAccount": "Zaloguj się do swojego konta",
+			"or": "LUB",
+			"dontHaveAccount": "Nie masz konta?",
+			"getStarted": "Zacznij teraz!",
+			"havingIssues": "Masz problemy?"
+		},
+		"signup": {
+			"signUpWithCredentials": "Utwórz konto",
+			"haveAnAccount": "Masz konto?",
+			"login": "Zaloguj się!"
+		},
+		"forgot": {
+			"forgotPasswordTitle": "Zapomniałeś hasła",
+			"forgotPasswordMessage": "Wyślemy Ci link do resetowania, jeśli konto istnieje",
+			"backToLogin": "Powrót do logowania"
+		},
+		"mfaRecovery": {
+			"mfaRecoveryTitle": "Odzyskiwanie 2FA",
+			"mfaRecoveryMessage": "Wyślemy Ci instrukcje, jak odzyskać swoje konto",
+			"backToLogin": "Powrót do logowania"
+		},
+		"mfaRecoveryReset": {
+			"mfaRecoveryResetTitle": "Odzyskiwanie 2FA",
+			"mfaRecoveryResetMessage": "Wprowadź swoje dane uwierzytelniające i kod odzyskiwania",
+			"backToLogin": "Powrót do logowania"
+		}
+	},
 	"networks": {
 		"loading": "Ładowanie",
 		"title": "Sieci",
diff --git a/src/locales/zh-tw/common.json b/src/locales/zh-tw/common.json
index 21699ff3..09d0164c 100644
--- a/src/locales/zh-tw/common.json
+++ b/src/locales/zh-tw/common.json
@@ -135,6 +135,57 @@
 		"user-settings": "使用者設定",
 		"logout": "登出"
 	},
+	"authPages": {
+		"welcomeMessage": {
+			"slogan": "ZeroTier VPN 讓您無論身在何處，都能安全私密地連接設備。享受快速可靠的連接，無需面對常見障礙，同時確保您的數據安全和可訪問。"
+		},
+		"form": {
+			"name": "姓名",
+			"namePlaceholder": "輸入您的姓名",
+			"email": "電子郵件",
+			"emailPlaceholder": "mail@example.com",
+			"password": "密碼",
+			"passwordPlaceholder": "輸入您的密碼",
+			"forgotPassword": "忘記密碼？",
+			"verify2FA": "驗證 2FA",
+			"enter2FAcode": "輸入2FA代碼",
+			"signIn": "登入",
+			"signInWith": "使用 {provider} 登入",
+			"signUp": "註冊",
+			"invitationCode": "邀請碼",
+			"invitationCodePlaceholder": "輸入您的邀請碼",
+			"sendMail": "發送郵件",
+			"mfaRecoveryCode": "恢復代碼",
+			"mfaRecoveryCodePlaceholder": "輸入您的恢復代碼"
+		},
+		"signin": {
+			"signInToAccount": "登入您的帳戶",
+			"or": "或",
+			"dontHaveAccount": "沒有帳戶？",
+			"getStarted": "立即開始！",
+			"havingIssues": "有問題嗎？"
+		},
+		"signup": {
+			"signUpWithCredentials": "創建帳戶",
+			"haveAnAccount": "有帳戶？",
+			"login": "登入！"
+		},
+		"forgot": {
+			"forgotPasswordTitle": "忘記密碼",
+			"forgotPasswordMessage": "如果帳戶存在，我們會向您發送重置鏈接",
+			"backToLogin": "返回登錄"
+		},
+		"mfaRecovery": {
+			"mfaRecoveryTitle": "2FA恢復",
+			"mfaRecoveryMessage": "我們將向您發送有關如何恢復您的帳戶的說明",
+			"backToLogin": "返回登錄"
+		},
+		"mfaRecoveryReset": {
+			"mfaRecoveryResetTitle": "2FA恢復",
+			"mfaRecoveryResetMessage": "請輸入您的憑證和恢復代碼",
+			"backToLogin": "返回登錄"
+		}
+	},
 	"networks": {
 		"loading": "載入中",
 		"title": "網路",
diff --git a/src/locales/zh/common.json b/src/locales/zh/common.json
index f6dfec9e..371a797b 100644
--- a/src/locales/zh/common.json
+++ b/src/locales/zh/common.json
@@ -135,6 +135,57 @@
 		"user-settings": "用户设置",
 		"logout": "登出"
 	},
+	"authPages": {
+		"welcomeMessage": {
+			"slogan": "ZeroTier VPN 让您无论身在何处，都能安全私密地连接设备。享受快速可靠的连接，无需面对常见障碍，同时确保您的数据安全和可访问。"
+		},
+		"form": {
+			"name": "姓名",
+			"namePlaceholder": "输入您的姓名",
+			"email": "电子邮件",
+			"emailPlaceholder": "mail@example.com",
+			"password": "密码",
+			"passwordPlaceholder": "输入您的密码",
+			"forgotPassword": "忘记密码？",
+			"verify2FA": "验证 2FA",
+			"enter2FAcode": "输入2FA代码",
+			"signIn": "登录",
+			"signInWith": "使用 {provider} 登录",
+			"signUp": "注册",
+			"invitationCode": "邀请码",
+			"invitationCodePlaceholder": "输入您的邀请码",
+			"sendMail": "发送邮件",
+			"mfaRecoveryCode": "恢复代码",
+			"mfaRecoveryCodePlaceholder": "输入您的恢复代码"
+		},
+		"signin": {
+			"signInToAccount": "登录您的账户",
+			"or": "或",
+			"dontHaveAccount": "没有账户？",
+			"getStarted": "立即开始！",
+			"havingIssues": "遇到问题？"
+		},
+		"signup": {
+			"signUpWithCredentials": "创建账户",
+			"haveAnAccount": "有账户？",
+			"login": "登录！"
+		},
+		"forgot": {
+			"forgotPasswordTitle": "忘记密码",
+			"forgotPasswordMessage": "如果账户存在，我们将向您发送重置链接",
+			"backToLogin": "返回登录"
+		},
+		"mfaRecovery": {
+			"mfaRecoveryTitle": "2FA恢复",
+			"mfaRecoveryMessage": "我们将向您发送恢复帐户的说明",
+			"backToLogin": "返回登录"
+		},
+		"mfaRecoveryReset": {
+			"mfaRecoveryResetTitle": "2FA恢复",
+			"mfaRecoveryResetMessage": "请输入您的凭据和恢复代码",
+			"backToLogin": "返回登录"
+		}
+	},
 	"networks": {
 		"loading": "加载中",
 		"title": "网络",
diff --git a/src/middleware.ts b/src/middleware.ts
index adee9bdd..d97f8c12 100644
--- a/src/middleware.ts
+++ b/src/middleware.ts
@@ -8,7 +8,8 @@ export const config = {
 		"/organization/:path*",
 		"/network/:path*",
 		"/central/:path*",
-		"/user-settings/:path*", // user are redirected to dashboard
+		"/user-settings/:path*",
+		"/auth/:path*",
 		"/admin/:path*",
 	],
 };
diff --git a/src/pages/auth/forgotPassword/index.tsx b/src/pages/auth/forgotPassword/index.tsx
index b7da2311..0f73f483 100644
--- a/src/pages/auth/forgotPassword/index.tsx
+++ b/src/pages/auth/forgotPassword/index.tsx
@@ -1,6 +1,7 @@
 import { GetServerSideProps, GetServerSidePropsContext } from "next";
 import { Session } from "next-auth";
 import { getSession } from "next-auth/react";
+import { useTranslations } from "next-intl";
 import Head from "next/head";
 import Link from "next/link";
 import React, { ReactElement } from "react";
@@ -9,6 +10,7 @@ import { LayoutPublic } from "~/components/layouts/layout";
 import { globalSiteTitle } from "~/utils/global";
 
 const ForgotPassword = () => {
+	const t = useTranslations();
 	const title = `${globalSiteTitle} - Forgot Password`;
 	return (
 		<div>
@@ -19,16 +21,16 @@ const ForgotPassword = () => {
 			</Head>
 
 			<div className="rounded-xl sm:border border-primary/50 sm:p-12 space-y-5 w-full">
-				<h3 className="text-xl font-semibold">Forgot Password </h3>
+				<h3 className="text-xl font-semibold">
+					{t("authPages.forgot.forgotPasswordTitle")}
+				</h3>
 				<div className="mb-4">
-					<p className="text-gray-500">
-						We will send you a reset link if the account exist
-					</p>
+					<p className="text-gray-500">{t("authPages.forgot.forgotPasswordMessage")}</p>
 					<div className="space-y-5"></div>
 					<ForgotPasswordForm />
 					<div className="pt-5">
 						<Link href="/auth/login" className="underline">
-							Back to Login
+							{t("authPages.forgot.backToLogin")}
 						</Link>
 					</div>
 					<div className="pt-5 text-center text-xs text-gray-400">
@@ -48,8 +50,12 @@ export const getServerSideProps: GetServerSideProps<Props> = async (
 	context: GetServerSidePropsContext,
 ) => {
 	const session = await getSession(context);
-	if (!session || !("user" in session)) {
-		return { props: {} };
+	if (!session || !("user" in session) || !session.user) {
+		return {
+			props: {
+				messages: (await import(`~/locales/${context.locale}/common.json`)).default,
+			},
+		};
 	}
 
 	if (session.user) {
@@ -62,7 +68,9 @@ export const getServerSideProps: GetServerSideProps<Props> = async (
 	}
 
 	return {
-		props: { auth: session.user },
+		props: {
+			auth: null,
+		},
 	};
 };
 
diff --git a/src/pages/auth/login/index.tsx b/src/pages/auth/login/index.tsx
index 426c92e1..780771e8 100644
--- a/src/pages/auth/login/index.tsx
+++ b/src/pages/auth/login/index.tsx
@@ -11,8 +11,10 @@ import { api } from "~/utils/api";
 import { useRouter } from "next/router";
 import classNames from "classnames";
 import { ErrorCode, getErrorMessage } from "~/utils/errorCode";
+import { useTranslations } from "use-intl";
 
 const Login = ({ title, oauthExclusiveLogin, oauthEnabled }) => {
+	const t = useTranslations();
 	const currentYear = new Date().getFullYear();
 	const { data: options, isLoading: loadingRegistration } =
 		api.public.registrationAllowed.useQuery();
@@ -44,22 +46,24 @@ const Login = ({ title, oauthExclusiveLogin, oauthEnabled }) => {
 						<span className="text-sm text-red-500">{errorMessage}</span>
 					</div>
 				)}
-				<h3 className="text-xl font-semibold">Sign in to your account</h3>
+				<h3 className="text-xl font-semibold">{t("authPages.signin.signInToAccount")}</h3>
 				<div className="space-y-5">
 					{!oauthExclusiveLogin && <CredentialsForm />}
 
 					{oauthEnabled && (
 						<div>
-							{!oauthExclusiveLogin && <div className="divider">OR</div>}
+							{!oauthExclusiveLogin && (
+								<div className="divider">{t("authPages.signin.or")}</div>
+							)}
 							<OauthLogin />
 						</div>
 					)}
 
 					{options?.enableRegistration && !loadingRegistration ? (
 						<div className="pt-5">
-							<p className="mb-4">Don't have an account?</p>
+							<p className="mb-4">{t("authPages.signin.dontHaveAccount")}</p>
 							<Link href="/auth/register" className="underline">
-								Get Started!
+								{t("authPages.signin.getStarted")}
 							</Link>
 						</div>
 					) : null}
@@ -82,10 +86,16 @@ export const getServerSideProps: GetServerSideProps<Props> = async (
 ) => {
 	const oauthExclusiveLogin = process.env.OAUTH_EXCLUSIVE_LOGIN === "true";
 	const oauthEnabled = !!process.env.OAUTH_ID && !!process.env.OAUTH_SECRET;
-
 	const session = await getSession(context);
-	if (!session || !session.user) {
-		return { props: { oauthExclusiveLogin, oauthEnabled } };
+
+	if (!session || !("user" in session) || !session.user) {
+		return {
+			props: {
+				oauthExclusiveLogin,
+				oauthEnabled,
+				messages: (await import(`~/locales/${context.locale}/common.json`)).default,
+			},
+		};
 	}
 
 	if (session.user) {
@@ -98,7 +108,7 @@ export const getServerSideProps: GetServerSideProps<Props> = async (
 	}
 
 	return {
-		props: { auth: session.user },
+		props: { auth: null },
 	};
 };
 
diff --git a/src/pages/auth/mfaRecovery/index.tsx b/src/pages/auth/mfaRecovery/index.tsx
index dae54b5a..0b9b1c7c 100644
--- a/src/pages/auth/mfaRecovery/index.tsx
+++ b/src/pages/auth/mfaRecovery/index.tsx
@@ -1,6 +1,7 @@
 import { GetServerSideProps, GetServerSidePropsContext } from "next";
 import { Session } from "next-auth";
 import { getSession } from "next-auth/react";
+import { useTranslations } from "next-intl";
 import Head from "next/head";
 import Link from "next/link";
 import React, { ReactElement } from "react";
@@ -9,6 +10,7 @@ import { LayoutPublic } from "~/components/layouts/layout";
 import { globalSiteTitle } from "~/utils/global";
 
 const MfaRecovery = () => {
+	const t = useTranslations();
 	const title = `${globalSiteTitle} - Forgot Password`;
 	return (
 		<div>
@@ -20,15 +22,17 @@ const MfaRecovery = () => {
 			<div className="z-10 flex justify-center self-center">
 				<div className="w-100 mx-auto rounded-2xl border border-primary p-12">
 					<div className="mb-4">
-						<h3 className="text-xl font-semibold">2FA Recovery</h3>
+						<h3 className="text-xl font-semibold">
+							{t("authPages.mfaRecovery.mfaRecoveryTitle")}
+						</h3>
 						<p className="text-gray-500">
-							We will send you instructions on how to recover your account
+							{t("authPages.mfaRecovery.mfaRecoveryMessage")}
 						</p>
 					</div>
 					<MfaRecoveryForm />
 					<div className="pt-5">
 						<Link href="/auth/login" className="underline">
-							Back to Login
+							{t("authPages.mfaRecovery.backToLogin")}
 						</Link>
 					</div>
 					<div className="pt-5 text-center text-xs text-gray-400">
@@ -48,8 +52,12 @@ export const getServerSideProps: GetServerSideProps<Props> = async (
 	context: GetServerSidePropsContext,
 ) => {
 	const session = await getSession(context);
-	if (!session || !("user" in session)) {
-		return { props: {} };
+	if (!session || !("user" in session) || !session.user) {
+		return {
+			props: {
+				messages: (await import(`~/locales/${context.locale}/common.json`)).default,
+			},
+		};
 	}
 
 	if (session.user) {
diff --git a/src/pages/auth/mfaRecovery/reset/index.tsx b/src/pages/auth/mfaRecovery/reset/index.tsx
index a17c5be4..d5595cec 100644
--- a/src/pages/auth/mfaRecovery/reset/index.tsx
+++ b/src/pages/auth/mfaRecovery/reset/index.tsx
@@ -8,8 +8,10 @@ import { globalSiteTitle } from "~/utils/global";
 import FormInput from "~/components/auth/formInput";
 import FormSubmitButtons from "~/components/auth/formSubmitButton";
 import { ErrorCode } from "~/utils/errorCode";
+import { useTranslations } from "next-intl";
 
 const MfaRecoveryReset = () => {
+	const t = useTranslations();
 	const router = useRouter();
 	const { token } = router.query;
 	const [state, setState] = useState({ email: "", password: "", recoveryCode: "" });
@@ -95,19 +97,21 @@ const MfaRecoveryReset = () => {
 			<div className="z-10 flex h-screen w-screen items-center justify-center">
 				<div className="w-100 mx-auto rounded-2xl border border-1 border-primary p-12">
 					<div className="mb-4">
-						<h3 className="text-2xl font-semibold">2FA Recovery</h3>
+						<h3 className="text-2xl font-semibold">
+							{t("authPages.mfaRecoveryReset.mfaRecoveryResetTitle")}
+						</h3>
 						<p className="text-gray-500">
-							Please enter your credentials and Recovery Code
+							{t("authPages.mfaRecoveryReset.mfaRecoveryResetMessage")}
 						</p>
 					</div>
 					<form className="space-y-5" onSubmit={handleSubmit}>
 						<FormInput
-							label="Email"
+							label={t("authPages.form.email")}
 							name="email"
 							type="email"
 							value={state.email}
 							onChange={handleChange}
-							placeholder="mail@example.com"
+							placeholder={t("authPages.form.emailPlaceholder")}
 							icon={
 								<svg
 									xmlns="http://www.w3.org/2000/svg"
@@ -121,12 +125,12 @@ const MfaRecoveryReset = () => {
 							}
 						/>
 						<FormInput
-							label="Password"
+							label={t("authPages.form.password")}
 							name="password"
 							type="password"
 							value={state.password}
 							onChange={handleChange}
-							placeholder="Enter your password"
+							placeholder={t("authPages.form.passwordPlaceholder")}
 							icon={
 								<svg
 									xmlns="http://www.w3.org/2000/svg"
@@ -143,12 +147,12 @@ const MfaRecoveryReset = () => {
 							}
 						/>
 						<FormInput
-							label="Recovery Code"
+							label={t("authPages.form.mfaRecoveryCode")}
 							name="recoveryCode"
 							type="text"
 							value={state.recoveryCode}
 							onChange={handleChange}
-							placeholder="Enter Code"
+							placeholder={t("authPages.form.mfaRecoveryCodePlaceholder")}
 							icon={
 								<svg
 									xmlns="http://www.w3.org/2000/svg"
@@ -165,7 +169,7 @@ const MfaRecoveryReset = () => {
 							}
 						/>
 						<div className="pt-5">
-							<FormSubmitButtons loading={isLoading} title="Submit" />
+							<FormSubmitButtons loading={isLoading} title={t("commonButtons.submit")} />
 						</div>
 					</form>
 					<div className="pt-5 text-center text-xs text-gray-400">
diff --git a/src/pages/auth/register/index.tsx b/src/pages/auth/register/index.tsx
index aff18ad3..ec651e8f 100644
--- a/src/pages/auth/register/index.tsx
+++ b/src/pages/auth/register/index.tsx
@@ -10,10 +10,11 @@ import { globalSiteTitle } from "~/utils/global";
 import { useRouter } from "next/router";
 import RegisterOrganizationInviteForm from "~/components/auth/registerOrganizationInvite";
 import Link from "next/link";
+import { useTranslations } from "next-intl";
 
 const Register = () => {
 	const title = `${globalSiteTitle} - Sign Up`;
-
+	const t = useTranslations();
 	const router = useRouter();
 	const { organizationInvite } = router.query as { organizationInvite?: string };
 	return (
@@ -25,16 +26,18 @@ const Register = () => {
 				<link rel="icon" href="/favicon.ico" />
 			</Head>
 			<div className="rounded-xl sm:border border-primary/50 sm:p-12 space-y-5 w-full">
-				<h3 className="text-xl font-semibold">Sign up with credentials</h3>
+				<h3 className="text-xl font-semibold">
+					{t("authPages.signup.signUpWithCredentials")}
+				</h3>
 				{organizationInvite ? (
 					<RegisterOrganizationInviteForm organizationInvite={organizationInvite} />
 				) : (
 					<RegisterForm />
 				)}
 				<div className="pt-5">
-					<p className="mb-4">Have an account?</p>
+					<p className="mb-4">{t("authPages.signup.haveAnAccount")}</p>
 					<Link href="/auth/login" className="underline">
-						Login!
+						{t("authPages.signup.login")}
 					</Link>
 				</div>
 				<div className="pt-5 text-center text-xs text-gray-400">
@@ -76,8 +79,13 @@ export const getServerSideProps: GetServerSideProps<Props> = async (
 			},
 		};
 	}
-	if (!session || !("user" in session)) {
-		return { props: {} };
+
+	if (!session || !("user" in session) || !session.user) {
+		return {
+			props: {
+				messages: (await import(`~/locales/${context.locale}/common.json`)).default,
+			},
+		};
 	}
 
 	if (session.user && !ztnetOrganizationInvite) {
@@ -90,7 +98,10 @@ export const getServerSideProps: GetServerSideProps<Props> = async (
 	}
 
 	return {
-		props: { auth: session.user },
+		props: {
+			auth: session.user,
+			messages: (await import(`~/locales/${context.locale}/common.json`)).default,
+		},
 	};
 };
 
diff --git a/src/server/api/routers/organizationRouter.ts b/src/server/api/routers/organizationRouter.ts
index 2236d031..6f030da2 100644
--- a/src/server/api/routers/organizationRouter.ts
+++ b/src/server/api/routers/organizationRouter.ts
@@ -948,7 +948,11 @@ export const organizationRouter = createTRPCRouter({
 					await ctx.prisma.invitation.deleteMany({
 						where: {
 							email: tokenPayload.email,
-							organizations: tokenPayload.organizationId,
+							organizations: {
+								some: {
+									organizationId: tokenPayload.organizationId,
+								},
+							},
 						},
 					});
 
@@ -966,8 +970,8 @@ export const organizationRouter = createTRPCRouter({
 						organizationId: tokenPayload.organizationId,
 					};
 				}
-			} catch (_e) {
-				throw new Error("An error occurred while processing the invitation link.");
+			} catch (error) {
+				throw new Error(error.message);
 			}
 			// if the user does not exist, return empty object
 			return {};