diff --git a/client/src/Pages/Account/components/AddMemberMenu/index.jsx b/client/src/Pages/Account/components/AddMemberMenu/index.jsx
index 5ed2ce96c..ab1ba599d 100644
--- a/client/src/Pages/Account/components/AddMemberMenu/index.jsx
+++ b/client/src/Pages/Account/components/AddMemberMenu/index.jsx
@@ -27,7 +27,7 @@ const AddMemberMenu = ({ handleInviteOpen, handleIsRegisterOpen }) => {
 				endIcon={<ArrowDropDownIcon sx={{ color: theme.palette.secondary.light }} />}
 				onClick={handleClick}
 			>
-				Add Team Member
+				{t("teamPanel.addTeamMember.addMemberMenu")}
 			</Button>
 			<Menu
 				anchorEl={anchorEl}
diff --git a/client/src/Pages/Account/components/AddTeamMember/hooks/useAddTeamMember.jsx b/client/src/Pages/Account/components/AddTeamMember/hooks/useAddTeamMember.jsx
index a6e049d4d..e42c504b2 100644
--- a/client/src/Pages/Account/components/AddTeamMember/hooks/useAddTeamMember.jsx
+++ b/client/src/Pages/Account/components/AddTeamMember/hooks/useAddTeamMember.jsx
@@ -1,6 +1,8 @@
 import { useState } from "react";
 import { newOrChangedCredentials } from "../../../../../Validation/validation";
+import { useTranslation } from "react-i18next";
 const useAddTeamMember = () => {
+	const { t } = useTranslation();
 	const [errors, setErrors] = useState({});
 
 	const clearErrors = () => setErrors({});
@@ -29,7 +31,9 @@ const useAddTeamMember = () => {
 			}
 		}
 		if (!role[0] || role.length === 0) {
-			formErrors.role = "Role is required";
+			formErrors.role = t(
+				"teamPanel.registerTeamMember.auth.common.inputs.role.errors.empty"
+			);
 		}
 		if (Object.keys(formErrors).length > 0) {
 			setErrors(formErrors);
diff --git a/client/src/Pages/Account/components/AddTeamMember/index.jsx b/client/src/Pages/Account/components/AddTeamMember/index.jsx
index 80918e7eb..c9f5d6c6e 100644
--- a/client/src/Pages/Account/components/AddTeamMember/index.jsx
+++ b/client/src/Pages/Account/components/AddTeamMember/index.jsx
@@ -56,8 +56,8 @@ const AddTeamMember = ({ handleIsRegisterOpen, isRegisterOpen, onMemberAdded })
 	const onsubmitAddMember = async (event) => {
 		event.preventDefault();
 		if (!validateForm(form, role)) return;
-		setIsLoadingSubmit(true);
 		try {
+			setIsLoadingSubmit(true);
 			await addTeamMember(form, role);
 			createToast({
 				body: t("teamPanel.registerToast.success"),
diff --git a/client/src/Pages/Account/components/TeamPanel.jsx b/client/src/Pages/Account/components/TeamPanel.jsx
index c3307cecf..fc1768642 100644
--- a/client/src/Pages/Account/components/TeamPanel.jsx
+++ b/client/src/Pages/Account/components/TeamPanel.jsx
@@ -67,9 +67,9 @@ const TeamPanel = () => {
 			render: (row) => row.role,
 		},
 	];
-	const [refreshTrigger, setRefreshTrigger] = useState(0);
+	const [refreshTrigger, setRefreshTrigger] = useState(false);
 	const refreshTeamList = () => {
-		setRefreshTrigger((prev) => prev + 1);
+		setRefreshTrigger((prev) => !prev);
 	};
 	useEffect(() => {
 		const fetchTeam = async () => {
diff --git a/client/src/locales/en.json b/client/src/locales/en.json
index 2a6c466e4..1aeb4b6a2 100644
--- a/client/src/locales/en.json
+++ b/client/src/locales/en.json
@@ -361,6 +361,7 @@
 	},
 	"teamPanel": {
 		"addTeamMember": {
+			"addMemberMenu": "Add Team Member",
 			"title": "Register new team member",
 			"description": "Create a new user and share the credentials with them. This method gives the member immediate access to all monitors.",
 			"addButton": "Add Member"
@@ -408,6 +409,11 @@
 								"empty": "To continue, please enter an email address",
 								"invalid": "Please recheck validity of entered email address"
 							}
+						},
+						"role": {
+							"errors": {
+								"empty": "Role is required"
+							}
 						}
 					}
 				}