diff --git a/Client/src/Components/TabPanels/Account/TeamPanel.jsx b/Client/src/Components/TabPanels/Account/TeamPanel.jsx
index d44650a24..74fae01c6 100644
--- a/Client/src/Components/TabPanels/Account/TeamPanel.jsx
+++ b/Client/src/Components/TabPanels/Account/TeamPanel.jsx
@@ -3,7 +3,6 @@ import TabPanel from "@mui/lab/TabPanel";
 import { Button, ButtonGroup, Stack, Typography } from "@mui/material";
 import { useEffect, useState } from "react";
 import TextInput from "../../Inputs/TextInput";
-import Field from "../../Inputs/Field";
 import { credentials } from "../../../Validation/validation";
 import { networkService } from "../../../main";
 import { createToast } from "../../../Utils/toastUtils";
diff --git a/Client/src/Pages/AdvancedSettings/index.jsx b/Client/src/Pages/AdvancedSettings/index.jsx
index a830159b8..60742c51b 100644
--- a/Client/src/Pages/AdvancedSettings/index.jsx
+++ b/Client/src/Pages/AdvancedSettings/index.jsx
@@ -1,5 +1,6 @@
 import { useTheme } from "@emotion/react";
 import { Box, Stack, Typography } from "@mui/material";
+import TextInput from "../../Components/Inputs/TextInput";
 import Field from "../../Components/Inputs/Field";
 import Link from "../../Components/Link";
 import "./index.css";
@@ -160,13 +161,14 @@ const AdvancedSettings = ({ isAdmin }) => {
 						</Typography>
 					</Box>
 					<Stack gap={theme.spacing(20)}>
-						<Field
+						<TextInput
 							id="apiBaseUrl"
 							label="API URL Host"
 							value={localSettings.apiBaseUrl}
 							onChange={handleChange}
 							onBlur={handleBlur}
-							error={errors.apiBaseUrl}
+							error={errors.apiBaseUrl ? true : false}
+							helperText={errors.apiBaseUrl}
 						/>
 						<Select
 							id="logLevel"
@@ -189,7 +191,7 @@ const AdvancedSettings = ({ isAdmin }) => {
 						</Typography>
 					</Box>
 					<Stack gap={theme.spacing(20)}>
-						<Field
+						<TextInput
 							type="text"
 							id="systemEmailHost"
 							label="System email host"
@@ -197,9 +199,10 @@ const AdvancedSettings = ({ isAdmin }) => {
 							value={localSettings.systemEmailHost}
 							onChange={handleChange}
 							onBlur={handleBlur}
-							error={errors.systemEmailHost}
+							error={errors.systemEmailHost ? true : false}
+							helperText={errors.systemEmailHost}
 						/>
-						<Field
+						<TextInput
 							type="number"
 							id="systemEmailPort"
 							label="System email port"
@@ -207,18 +210,21 @@ const AdvancedSettings = ({ isAdmin }) => {
 							value={localSettings.systemEmailPort?.toString()}
 							onChange={handleChange}
 							onBlur={handleBlur}
-							error={errors.systemEmailPort}
+							error={errors.systemEmailPort ? true : false}
+							helperText={errors.systemEmailPort}
 						/>
-						<Field
+						<TextInput
 							type="email"
 							id="systemEmailAddress"
 							label="System email address"
 							name="systemEmailAddress"
 							value={localSettings.systemEmailAddress}
 							onChange={handleChange}
-							error={errors.systemEmailAddress}
+							onBlur={handleBlur}
+							error={errors.systemEmailAddress ? true : false}
+							helperText={errors.systemEmailAddress}
 						/>
-						<Field
+						<TextInput
 							type="text"
 							id="systemEmailPassword"
 							label="System email password"
@@ -226,7 +232,8 @@ const AdvancedSettings = ({ isAdmin }) => {
 							value={localSettings.systemEmailPassword}
 							onChange={handleChange}
 							onBlur={handleBlur}
-							error={errors.systemEmailPassword}
+							error={errors.systemEmailPassword ? true : false}
+							helperText={errors.systemEmailPassword}
 						/>
 					</Stack>
 				</ConfigBox>
@@ -242,7 +249,7 @@ const AdvancedSettings = ({ isAdmin }) => {
 							direction="row"
 							gap={theme.spacing(10)}
 						>
-							<Field
+							<TextInput
 								type="number"
 								id="jwtTTLNum"
 								label="JWT time to live"
@@ -250,7 +257,8 @@ const AdvancedSettings = ({ isAdmin }) => {
 								value={localSettings.jwtTTLNum.toString()}
 								onChange={handleChange}
 								onBlur={handleBlur}
-								error={errors.jwtTTLNum}
+								error={errors.jwtTTLNum ? true : false}
+								helperText={errors.jwtTTLNum}
 							/>
 							<Select
 								id="jwtTTLUnits"
@@ -265,7 +273,7 @@ const AdvancedSettings = ({ isAdmin }) => {
 								error={errors.jwtTTLUnits}
 							/>
 						</Stack>
-						<Field
+						<TextInput
 							type="text"
 							id="dbType"
 							label="Database type"
@@ -273,9 +281,10 @@ const AdvancedSettings = ({ isAdmin }) => {
 							value={localSettings.dbType}
 							onChange={handleChange}
 							onBlur={handleBlur}
-							error={errors.dbType}
+							error={errors.dbType ? true : false}
+							helperText={errors.dbType}
 						/>
-						<Field
+						<TextInput
 							type="text"
 							id="redisHost"
 							label="Redis host"
@@ -283,9 +292,10 @@ const AdvancedSettings = ({ isAdmin }) => {
 							value={localSettings.redisHost}
 							onChange={handleChange}
 							onBlur={handleBlur}
-							error={errors.redisHost}
+							error={errors.redisHost ? true : false}
+							helperText={errors.redisHost}
 						/>
-						<Field
+						<TextInput
 							type="number"
 							id="redisPort"
 							label="Redis port"
@@ -293,9 +303,10 @@ const AdvancedSettings = ({ isAdmin }) => {
 							value={localSettings.redisPort?.toString()}
 							onChange={handleChange}
 							onBlur={handleBlur}
-							error={errors.redisPort}
+							error={errors.redisPort ? true : false}
+							helperText={errors.redisPort}
 						/>
-						<Field
+						<TextInput
 							type="text"
 							id="pagespeedApiKey"
 							label="PageSpeed API key"
@@ -303,7 +314,8 @@ const AdvancedSettings = ({ isAdmin }) => {
 							value={localSettings.pagespeedApiKey}
 							onChange={handleChange}
 							onBlur={handleBlur}
-							error={errors.pagespeedApiKey}
+							error={errors.pagespeedApiKey ? true : false}
+							helperText={errors.pagespeedApiKey}
 						/>
 					</Stack>
 				</ConfigBox>