diff --git a/client/src/Pages/Auth/Register/Register.jsx b/client/src/Pages/Auth/Register/Register.jsx
index 934508c71..45c866797 100644
--- a/client/src/Pages/Auth/Register/Register.jsx
+++ b/client/src/Pages/Auth/Register/Register.jsx
@@ -15,7 +15,7 @@ import Background from "../../../assets/Images/background-grid.svg?react";
 import Logo from "../../../assets/icons/checkmate-icon.svg?react";
 import Mail from "../../../assets/icons/mail.svg?react";
 import "../index.css";
-import { useTranslation } from "react-i18next";
+import { useTranslation, Trans } from "react-i18next";
 /**
  * Displays the initial landing page.
  *
@@ -67,42 +67,47 @@ const LandingPage = ({ isSuperAdmin, onSignup }) => {
 				</Box>
 				<Box maxWidth={400}>
 					<Typography className="tos-p">
-						{t("authRegisterBySigningUp")}{" "}
-						<Typography
-							component="span"
-							onClick={() => {
-								window.open(
-									"https://bluewavelabs.ca/terms-of-service-open-source",
-									"_blank",
-									"noreferrer"
-								);
+						<Trans
+							i18nKey="authRegisterBySigningUp"
+							components={{
+								a1: (
+									<Typography
+										component="span"
+										sx={{
+											cursor: "pointer",
+											"&:hover": {
+												color: theme.palette.primary.contrastTextTertiary,
+											},
+										}}
+										onClick={() => {
+											window.open(
+												"https://bluewavelabs.ca/terms-of-service-open-source",
+												"_blank",
+												"noreferrer"
+											);
+										}}
+									/>
+								),
+								a2: (
+									<Typography
+										component="span"
+										sx={{
+											cursor: "pointer",
+											"&:hover": {
+												color: theme.palette.primary.contrastTextTertiary,
+											},
+										}}
+										onClick={() => {
+											window.open(
+												"https://bluewavelabs.ca/privacy-policy-open-source",
+												"_blank",
+												"noreferrer"
+											);
+										}}
+									/>
+								)
 							}}
-							sx={{
-								"&:hover": {
-									color: theme.palette.primary.contrastTextTertiary,
-								},
-							}}
-						>
-							{t("authRegisterTerms")}
-						</Typography>{" "}
-						{t("and")}{" "}
-						<Typography
-							component="span"
-							onClick={() => {
-								window.open(
-									"https://bluewavelabs.ca/privacy-policy-open-source",
-									"_blank",
-									"noreferrer"
-								);
-							}}
-							sx={{
-								"&:hover": {
-									color: theme.palette.primary.contrastTextTertiary,
-								},
-							}}
-						>
-							{t("authRegisterPrivacy")}
-						</Typography>
+						/>
 					</Typography>
 				</Box>
 			</Stack>
diff --git a/client/src/Pages/Auth/Register/StepOne/index.jsx b/client/src/Pages/Auth/Register/StepOne/index.jsx
index 4bb357e26..cb66f6704 100644
--- a/client/src/Pages/Auth/Register/StepOne/index.jsx
+++ b/client/src/Pages/Auth/Register/StepOne/index.jsx
@@ -64,7 +64,7 @@ function StepOne({ form, errors, onSubmit, onChange, onBack }) {
 					>
 						<TextInput
 							id="register-firstname-input"
-							label="Name"
+							label={t("authRegisterFirstName")}
 							isRequired={true}
 							placeholder="Jordan"
 							autoComplete="given-name"
@@ -76,7 +76,7 @@ function StepOne({ form, errors, onSubmit, onChange, onBack }) {
 						/>
 						<TextInput
 							id="register-lastname-input"
-							label="Surname"
+							label={t("authRegisterLastName")}
 							isRequired={true}
 							placeholder="Ellis"
 							autoComplete="family-name"
diff --git a/client/src/Pages/Auth/Register/StepThree/index.jsx b/client/src/Pages/Auth/Register/StepThree/index.jsx
index eb05f843a..1af8a60dc 100644
--- a/client/src/Pages/Auth/Register/StepThree/index.jsx
+++ b/client/src/Pages/Auth/Register/StepThree/index.jsx
@@ -64,7 +64,7 @@ function StepThree({ onSubmit, onBack }) {
 							type="password"
 							id="register-password-input"
 							name="password"
-							label={t("commonPassword")}
+							label={t("authLoginEnterPassword")}
 							isRequired={true}
 							placeholder={t("createAPassword")}
 							autoComplete="current-password"
diff --git a/client/src/Pages/Auth/Register/StepTwo/index.jsx b/client/src/Pages/Auth/Register/StepTwo/index.jsx
index a16d5344b..d40ff161f 100644
--- a/client/src/Pages/Auth/Register/StepTwo/index.jsx
+++ b/client/src/Pages/Auth/Register/StepTwo/index.jsx
@@ -60,7 +60,7 @@ function StepTwo({ form, errors, onSubmit, onChange, onBack }) {
 					<TextInput
 						type="email"
 						id="register-email-input"
-						label={t("commonEmail")}
+						label={t("authRegisterEmail")}
 						isRequired={true}
 						placeholder="jordan.ellis@domain.com"
 						autoComplete="email"
@@ -68,7 +68,7 @@ function StepTwo({ form, errors, onSubmit, onChange, onBack }) {
 						onInput={(e) => (e.target.value = e.target.value.toLowerCase())}
 						onChange={onChange}
 						error={errors.email ? true : false}
-						helperText={errors.email}
+						helperText={errors.email && t("authRegisterEmailRequired")}
 						ref={inputRef}
 					/>
 					<Stack
diff --git a/client/src/Validation/validation.js b/client/src/Validation/validation.js
index 6e8ff76cb..0b9088e1c 100644
--- a/client/src/Validation/validation.js
+++ b/client/src/Validation/validation.js
@@ -7,18 +7,11 @@ const nameSchema = joi
 	.string()
 	.max(50)
 	.trim()
-	.pattern(/^(?=.*[\p{L}\p{Sc}])[\p{L}\p{Sc}\s']+$/u, {
-		name: "name.containsLetterOrSymbol",
-	})
-	.pattern(/^[\p{L}\p{Sc}\s']+$/u, {
-		name: "name.validCharacters",
-	})
+	.pattern(/^[\p{L}\p{M}''\- ]+$/u)
 	.messages({
 		"string.empty": "Name is required",
 		"string.max": "Name must be less than 50 characters",
-		"string.pattern.name": "Name must contain at least 1 letter or currency symbol",
-		"string.pattern.base.validCharacters":
-			"Can only contain letters, spaces, apostrophes, and currency symbols",
+		"string.pattern.base": "Name must contain only letters, spaces, apostrophes, or hyphens"
 	});
 
 const passwordSchema = joi
diff --git a/client/src/locales/gb.json b/client/src/locales/gb.json
index 95ef6d32e..12653725b 100644
--- a/client/src/locales/gb.json
+++ b/client/src/locales/gb.json
@@ -53,9 +53,13 @@
   "authPasswordConfirmAndPassword": "Confirm password and password",
   "authPasswordMustMatch": "must match",
   "authRegisterCreateAccount": "Create your account to get started",
-  "authRegisterCreateSuperAdminAccount": "Create your Super admin account to get started",
-  "authRegisterSignUpWithEmail": "Sign up with Email",
-  "authRegisterBySigningUp": "By signing up, you agree to our",
+  "authRegisterCreateSuperAdminAccount": "Create your super admin account to get started",
+  "authRegisterSignUpWithEmail": "Create super admin account",
+  "authRegisterBySigningUp": "By creating an account, you agree to our <a1>Terms of Service</a1> and <a2>Privacy Policy</a2>.",
+  "authRegisterFirstName": "Name",
+  "authRegisterLastName": "Surname",
+  "authRegisterEmail": "Email",
+  "authRegisterEmailRequired": "Email is required",
   "distributedStatusHeaderText": "Real-time, real-device coverage",
   "distributedStatusSubHeaderText": "Powered by millions devices worldwide, view a system performance by global region, country or city",
   "settingsGeneralSettings": "General settings",
diff --git a/client/src/locales/ru.json b/client/src/locales/ru.json
index 5d0f649de..520d34826 100644
--- a/client/src/locales/ru.json
+++ b/client/src/locales/ru.json
@@ -54,8 +54,12 @@
   "authPasswordMustMatch": "должен совпадать",
   "authRegisterCreateAccount": "Создайте свою учетную запись, чтобы начать",
   "authRegisterCreateSuperAdminAccount": "Создайте учетную запись суперадминистратора, чтобы начать работу",
-  "authRegisterSignUpWithEmail": "Зарегистрироваться по электронной почте",
-  "authRegisterBySigningUp": "Регистрируясь, вы соглашаетесь с нашими",
+  "authRegisterSignUpWithEmail": "Создать учетную запись суперадминистратора",
+  "authRegisterBySigningUp": "Создавая учетную запись, вы соглашаетесь с нашими <a1>Условиями использования</a1> и <a2>Политикой конфиденциальности</a2>.",
+  "authRegisterFirstName": "Имя",
+  "authRegisterLastName": "Фамилия",
+  "authRegisterEmail": "Эл. почта",
+  "authRegisterEmailRequired": "Эл. почта обязательна",
   "distributedStatusHeaderText": "Охват реального времени и реального устройства",
   "distributedStatusSubHeaderText": "Работает на миллионах устройств по всему миру, просматривайте производительность системы по глобальному региону, стране или городу",
   "settingsGeneralSettings": "Общие настройки",
diff --git a/client/src/locales/tr.json b/client/src/locales/tr.json
index d975d056c..09140e1c1 100644
--- a/client/src/locales/tr.json
+++ b/client/src/locales/tr.json
@@ -54,8 +54,12 @@
   "authPasswordMustMatch": "eşleşmelidir",
   "authRegisterCreateAccount": "Hesap oluşturmak için devam et",
   "authRegisterCreateSuperAdminAccount": "Super admin hesabınızı oluşturmak için devam edin",
-  "authRegisterSignUpWithEmail": "E-posta ile kayıt ol",
-  "authRegisterBySigningUp": "Kayıt olarak, aşağıdaki şartları kabul ediyorsunuz:",
+  "authRegisterSignUpWithEmail": "Süper yönetici hesabı oluştur",
+  "authRegisterBySigningUp": "Bir hesap oluşturarak, <a1>Hizmet Şartlarımızı</a1> ve <a2>Gizlilik Politikamızı</a2> kabul etmiş olursunuz.",
+  "authRegisterFirstName": "Ad",
+  "authRegisterLastName": "Soyad",
+  "authRegisterEmail": "E-posta",
+  "authRegisterEmailRequired": "E-posta gereklidir",
   "distributedStatusHeaderText": "Gerçek zamanlı, Gerçek cihazlar kapsamı",
   "distributedStatusSubHeaderText": "Dünya çapında milyonlarca cihaz tarafından desteklenen sistem performansını küresel bölgeye, ülkeye veya şehre göre görüntüleyin",
   "settingsGeneralSettings": "Genel ayarlar",