diff --git a/Client/src/Components/Button/index.jsx b/Client/src/Components/Button/index.jsx
index fcf157f5e..c53ece09e 100644
--- a/Client/src/Components/Button/index.jsx
+++ b/Client/src/Components/Button/index.jsx
@@ -58,15 +58,12 @@ const Button = ({ id, type, level, label, disabled, img, onClick, sx }) => {
       color={color}
       disabled={disabled}
       onClick={onClick}
+      disableRipple
       sx={{
         textTransform: "none",
         "&:focus": {
           outline: "none",
         },
-        "& .MuiTouchRipple-root": {
-          pointerEvents: "none",
-          display: "none",
-        },
         ...sx,
       }}
     >
diff --git a/Client/src/Components/ButtonSpinner/index.jsx b/Client/src/Components/ButtonSpinner/index.jsx
index 7f89f1ab9..2d940c539 100644
--- a/Client/src/Components/ButtonSpinner/index.jsx
+++ b/Client/src/Components/ButtonSpinner/index.jsx
@@ -70,6 +70,7 @@ const ButtonSpinner = ({
       endIcon={position === "end" && img}
       onClick={onClick}
       loading={isLoading}
+      disableRipple
       sx={{
         textTransform: "none",
         "&:focus": {
diff --git a/Client/src/Components/TabPanels/Account/ProfilePanel.jsx b/Client/src/Components/TabPanels/Account/ProfilePanel.jsx
index d5a286ec5..69a997a77 100644
--- a/Client/src/Components/TabPanels/Account/ProfilePanel.jsx
+++ b/Client/src/Components/TabPanels/Account/ProfilePanel.jsx
@@ -255,7 +255,8 @@ const ProfilePanel = () => {
             value={user.email}
             placeholder="Enter your email"
             autoComplete="email"
-            // onChange={handleChange}
+            // TODO - add onChange
+            onChange={() => console.log("Disabled.")}
             // error={errors[idToName["edit-email"]]}
             disabled={true}
           />
diff --git a/Client/src/Components/TabPanels/Account/TeamPanel.jsx b/Client/src/Components/TabPanels/Account/TeamPanel.jsx
index 471752dfa..5ef356f9c 100644
--- a/Client/src/Components/TabPanels/Account/TeamPanel.jsx
+++ b/Client/src/Components/TabPanels/Account/TeamPanel.jsx
@@ -21,6 +21,8 @@ import ButtonSpinner from "../../ButtonSpinner";
 import Button from "../../Button";
 import { useState } from "react";
 import EditSvg from "../../../assets/icons/edit.svg?react";
+import Field from "../../Inputs/Field";
+import { credentials } from "../../../Validation/validation";
 
 /**
  * TeamPanel component manages the organization and team members,
@@ -106,19 +108,11 @@ const TeamPanel = () => {
     name: "Bluewave Labs",
     isLoading: false,
     isEdit: false,
-    newName: "",
   });
 
   const toggleEdit = () => {
     setOrgStates((prev) => ({ ...prev, isEdit: !prev.isEdit }));
   };
-  const handleChange = (event) => {
-    const { value } = event.target;
-    setOrgStates((prev) => ({
-      ...prev,
-      name: value,
-    }));
-  };
   const handleRename = () => {};
 
   const [teamStates, setTeamStates] = useState({
@@ -163,8 +157,44 @@ const TeamPanel = () => {
       setIsLoading(false);
     }, 2000);
   };
+
+  const [toInvite, setToInvite] = useState({
+    email: "",
+    role: "",
+  });
+  const [errors, setErrors] = useState({});
+
+  const handleChange = (event) => {
+    const { value } = event.target;
+    setToInvite((prev) => ({
+      ...prev,
+      email: value,
+    }));
+
+    const validation = credentials.validate(
+      { email: value },
+      { abortEarly: false }
+    );
+
+    setErrors((prev) => {
+      const updatedErrors = { ...prev };
+
+      if (validation.error) {
+        updatedErrors.email = validation.error.details[0].message;
+      } else {
+        delete updatedErrors.email;
+      }
+      return updatedErrors;
+    });
+  };
   const [isOpen, setIsOpen] = useState(false);
   const handleInviteMember = () => {};
+  const closeInviteModal = () => {
+    setIsOpen(false);
+    setToInvite({ email: "", role: "" });
+    setErrors({});
+  };
+
   const handleMembersQuery = (type) => {
     let count = 0;
     teamStates.members.forEach((member) => {
@@ -188,7 +218,12 @@ const TeamPanel = () => {
           >
             <TextField
               value={orgStates.name}
-              onChange={handleChange}
+              onChange={(event) =>
+                setOrgStates((prev) => ({
+                  ...prev,
+                  name: event.target.value,
+                }))
+              }
               disabled={!orgStates.isEdit}
               sx={{
                 color: theme.palette.otherColors.bluishGray,
@@ -409,7 +444,7 @@ const TeamPanel = () => {
         aria-labelledby="modal-invite-member"
         aria-describedby="invite-member-to-team"
         open={isOpen}
-        onClose={() => setIsOpen(false)}
+        onClose={closeInviteModal}
         disablePortal
       >
         <Stack
@@ -433,22 +468,76 @@ const TeamPanel = () => {
           <Typography id="modal-invite-member" component="h1">
             Invite new team member
           </Typography>
-          <Typography id="invite-member-to-team" component="p">
+          <Typography
+            id="invite-member-to-team"
+            component="p"
+            sx={{ mb: theme.gap.medium }}
+          >
             When you add a new team member, they will get access to all
             monitors.
           </Typography>
-          <TextField
+          <Field
+            type="email"
             id="input-team-member"
-            spellCheck="false"
-            // value={orgStates.newName}
-            // onChange={(event) =>
-            //   setOrgStates((prev) => ({
-            //     ...prev,
-            //     newName: event.target.value,
-            //   }))
-            // }
-          ></TextField>
-          <Stack direction="row" gap="10px" mt="10px" justifyContent="flex-end">
+            placeholder="Email"
+            value={toInvite.email}
+            onChange={handleChange}
+            error={errors.email}
+          />
+          <Select
+            id="team-member-role"
+            value={toInvite.role}
+            onChange={(event) =>
+              setToInvite((prev) => ({
+                ...prev,
+                role: event.target.value,
+              }))
+            }
+            displayEmpty
+            MenuProps={{
+              PaperProps: {
+                style: {
+                  marginTop: theme.gap.xs,
+                },
+              },
+              MenuListProps: {
+                style: { padding: 0 },
+              },
+            }}
+            sx={{ mt: theme.gap.xs }}
+          >
+            <MenuItem disableRipple id="role-default" value="">
+              Select role
+            </MenuItem>
+            <MenuItem
+              disableRipple
+              value="admin"
+              sx={{
+                fontSize: "13px",
+                borderRadius: `${theme.shape.borderRadius}px`,
+                margin: theme.gap.xs,
+              }}
+            >
+              Admin
+            </MenuItem>
+            <MenuItem
+              disableRipple
+              value="user"
+              sx={{
+                fontSize: "13px",
+                borderRadius: `${theme.shape.borderRadius}px`,
+                margin: theme.gap.xs,
+              }}
+            >
+              User
+            </MenuItem>
+          </Select>
+          <Stack
+            direction="row"
+            gap={theme.gap.small}
+            mt={theme.gap.ml}
+            justifyContent="flex-end"
+          >
             <Button
               level="tertiary"
               label="Cancel"
diff --git a/Client/src/Pages/Account/index.css b/Client/src/Pages/Account/index.css
index ac0109f68..fef2e5b49 100644
--- a/Client/src/Pages/Account/index.css
+++ b/Client/src/Pages/Account/index.css
@@ -41,9 +41,9 @@
   justify-content: space-between;
   align-items: flex-start;
 }
-.edit-profile-form__wrapper>.MuiStack-root:not(.row-stack),
-.edit-password-form__wrapper>.MuiStack-root:not(.row-stack),
-.edit-organization-form__wrapper>.MuiStack-root:not(.row-stack) {
+.edit-profile-form__wrapper > .MuiStack-root:not(.row-stack),
+.edit-password-form__wrapper > .MuiStack-root:not(.row-stack),
+.edit-organization-form__wrapper > .MuiStack-root:not(.row-stack) {
   flex-direction: column;
   gap: 8px;
   margin-right: 10px;
@@ -139,7 +139,7 @@
   height: 18px !important;
   opacity: 0.8;
 }
-.account span.MuiTypography-root.input-error {
+.account:not(:has(#modal-invite-member)) span.MuiTypography-root.input-error {
   position: absolute;
   top: 100%;
 }
@@ -155,4 +155,21 @@
 .edit-profile-form__wrapper .MuiStack-root:has(.MuiFormControl-root),
 .edit-password-form__wrapper .MuiStack-root:has(.MuiFormControl-root) {
   margin: 0;
-}
\ No newline at end of file
+}
+
+#role-default {
+  display: none;
+  visibility: none;
+}
+.MuiInputBase-root:has(#team-member-role) {
+  height: 34px;
+}
+#team-member-role {
+  padding: 0 10px;
+  height: 100%;
+  display: flex;
+  align-items: center;
+}
+.MuiInputBase-root:not(.Mui-focused):has(#team-member-role):hover fieldset {
+  border-color: var(--env-var-color-29);
+}