diff --git a/web-console-v2/src/pages/UserManagement/AddUser.tsx b/web-console-v2/src/pages/UserManagement/AddUser.tsx
index 50c0286e..7ce09c6d 100644
--- a/web-console-v2/src/pages/UserManagement/AddUser.tsx
+++ b/web-console-v2/src/pages/UserManagement/AddUser.tsx
@@ -3,11 +3,13 @@ import { Dialog, DialogActions, DialogContent, DialogTitle, TextField, MenuItem,
 import { UserRequest } from './UserManagement';
 import { useUserList } from 'services/user';
 import { User } from './UserManagement';
+import { useAlert } from 'contexts/AlertContextProvider';
+import Alert from '@mui/material/Alert';
 
 interface AddUserProps {
     open: boolean;
     onClose: () => void;
-    onSubmit: (newUser: UserRequest) => void;
+    onSubmit: (newUser: UserRequest) => Promise<void>;
     currentUser: User;
 }
 
@@ -25,17 +27,16 @@ const emailRegex = /^[\w.-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$/;
 const AddUser: React.FC<AddUserProps> = ({ open, onClose, onSubmit, currentUser }) => {
     const [newUser, setNewUser] = useState<UserRequest>({
         user_name: '',
-        first_name: '',
-        last_name: '',
         email_address: '',
         password: '',
         roles: ['viewer'],
-        status: 'active',
     });
 
     const [isUsernameTaken, setIsUsernameTaken] = useState<boolean | null>(null);
     const [isEmailTaken, setIsEmailTaken] = useState<boolean | null>(null);
     const { data: users } = useUserList();
+    const { showAlert } = useAlert();
+    const [error, setError] = useState<boolean | null>(null);
 
     useEffect(() => {
         const userName = newUser?.user_name.replace(/\s+/g, '_');
@@ -71,36 +72,61 @@ const AddUser: React.FC<AddUserProps> = ({ open, onClose, onSubmit, currentUser
     };
 
     const handleSubmit = () => {
-        setTimeout(() => {
-            onSubmit(newUser);
-            onClose();
-            setNewUser({
-                user_name: '',
-                first_name: '',
-                last_name: '',
-                email_address: '',
-                roles: ['viewer'],
-                status: 'active',
-                password: ''
+        onSubmit(newUser)
+            .then(() => {
+                onClose(); 
+                resetForm(); 
+            })
+            .catch(() => {
+                showAlert('Failed to create user', 'error');
+                setError(true);
             });
-        }, 1000);
+    };
+    
+
+    const resetForm = () => {
+        setNewUser({
+            user_name: '',
+            email_address: '',
+            roles: ['viewer'],
+            password: '',
+        });
     };
 
-    const isEmailValid = newUser.email_address ? emailRegex.test(newUser.email_address) : true;
+    const isEmailValid = newUser?.email_address ? emailRegex.test(newUser?.email_address) : true;
+    const isFirstNameValid = !newUser.first_name || newUser.first_name.length >= 3;
+    const isLastNameValid = !newUser.last_name || newUser.last_name.length >= 3;
     const isFormValid =
-        newUser.user_name &&
-        newUser.email_address &&
-        newUser.password &&
-        newUser.roles.length > 0 &&
+        newUser?.user_name &&
+        newUser?.email_address &&
+        newUser?.password &&
+        newUser?.roles.length > 0 &&
         isUsernameTaken === false &&
-        isEmailTaken === false &&
-        isEmailValid;
+        isEmailValid &&
+        isFirstNameValid &&
+        isLastNameValid;
 
     const availableRoles = currentUser?.is_owner ? rolesOptions : rolesOptions.filter(role => role.value !== 'admin');
 
+    const handleCancel = () => {
+        setError(null);
+        resetForm();
+        onClose();
+    };
+
+    const handleDialogClose = (event: React.SyntheticEvent, reason: string) => {
+        if (reason && (reason !== 'backdropClick')) {
+            onClose();
+        }
+    };
+
     return (
-        <Dialog open={open} onClose={onClose}>
+        <Dialog
+            open={open}
+            onClose={handleDialogClose}
+        >
             <DialogTitle>Create New User</DialogTitle>
+            {error && <Alert severity="error">Failed to create User</Alert>}
             <DialogContent>
                 <TextField
                     label="User Name"
@@ -122,6 +148,8 @@ const AddUser: React.FC<AddUserProps> = ({ open, onClose, onSubmit, currentUser
                     value={newUser.first_name}
                     onChange={handleChange}
                     margin="normal"
+                    error={ !isFirstNameValid}
+                    helperText={!isFirstNameValid ? 'If provided, first name must be at least 3 characters' : ''}
                 />
                 <TextField
                     label="Last Name"
@@ -131,6 +159,8 @@ const AddUser: React.FC<AddUserProps> = ({ open, onClose, onSubmit, currentUser
                     value={newUser.last_name}
                     onChange={handleChange}
                     margin="normal"
+                    error={!isLastNameValid}
+                    helperText={!isLastNameValid ? 'If provided, last name must be at least 3 characters' : ''}
                 />
                 <TextField
                     label="Email"
@@ -175,7 +205,7 @@ const AddUser: React.FC<AddUserProps> = ({ open, onClose, onSubmit, currentUser
                 </FormControl>
             </DialogContent>
             <DialogActions>
-                <Button onClick={onClose} color="primary" variant='outlined' size='small'>
+                <Button onClick={handleCancel} color="primary" variant='outlined' size='small'>
                     Cancel
                 </Button>
                 <Button onClick={handleSubmit} color="primary" variant='contained' size='small' disabled={!isFormValid}>
diff --git a/web-console-v2/src/pages/UserManagement/UserManagement.tsx b/web-console-v2/src/pages/UserManagement/UserManagement.tsx
index 061d052b..6e32e90b 100644
--- a/web-console-v2/src/pages/UserManagement/UserManagement.tsx
+++ b/web-console-v2/src/pages/UserManagement/UserManagement.tsx
@@ -9,6 +9,8 @@ import Filters from './Filters';
 import AddUser from './AddUser';
 import ChangeRoleDialog from './ChangeRoleDialog';
 import AlertDialog from 'components/AlertDialog/AlertDialog';
+import { useAlert } from 'contexts/AlertContextProvider';
+import _ from 'lodash';
 
 export interface User {
     id: string;
@@ -28,12 +30,12 @@ export interface User {
 
 export type UserRequest = {
     user_name: string;
-    first_name: string;
-    last_name: string;
+    first_name?: string;
+    last_name?: string;
     email_address: string;
     password: string;
     roles: string[];
-    status: string;
+    status?: string;
 };
 
 const UserManagement = () => {
@@ -45,8 +47,9 @@ const UserManagement = () => {
     const { mutate: updateUserStatus } = useUserStatusManage();
     const [selectedUser, setSelectedUser] = useState<User | null>(null);
     const [openRoleChangeDialog, setOpenRoleChangeDialog] = useState<boolean>(false);
+    const { showAlert } = useAlert();
 
-    const { data, isLoading, refetch } = useUserList();
+    const { data, isLoading, refetch, isError } = useUserList();
     const { data: currentUser } = useUserRead();
     const [showModal, setShowModal] = useState<boolean>(false);
     const [pendingAction, setPendingAction] = useState<{ userName: string; } | null>(null);
@@ -92,21 +95,28 @@ const UserManagement = () => {
         setOpenDialog(false);
     };
 
-    const handleAddUser = (newUser: UserRequest) => {
-        setLoading(true);
-        createUser(
-            { payload: newUser },
-            {
-                onSuccess: () => {
-                    refetch();
-                    setOpenDialog(false);
-                    setLoading(false);
-                },
-                onError: (error) => {
-                    console.error('Error creating user:', error);
-                },
-            }
-        );
+    const handleAddUser = (newUser: UserRequest): Promise<void> => {
+        return new Promise<void>((resolve, reject) => {
+            setLoading(true);
+            const filteredPayload = _.pickBy(newUser, _.identity);
+            createUser(
+                { payload: filteredPayload },
+                {
+                    onSuccess: () => {
+                        refetch();
+                        setOpenDialog(false);
+                        setLoading(false);
+                        showAlert('User created successfully', 'success');
+                        resolve();
+                    },
+                    onError: (error) => {
+                        setLoading(false);
+                        showAlert('Failed to create user', 'error');
+                        reject(error);
+                    },
+                }
+            );
+        });
     };
 
     const handleDeactivateUser = (userName: string) => {
@@ -120,10 +130,12 @@ const UserManagement = () => {
             {
                 onSuccess: () => {
                     refetch();
+                    showAlert('User deactivated successfully', 'success');
                     setLoading(false);
                 },
                 onError: (error) => {
-                    console.error('Error deactivating user:', error);
+                    showAlert('Failed to deactivate user', 'error');
+                    setLoading(false);
                 },
             }
         );
@@ -140,19 +152,33 @@ const UserManagement = () => {
             {
                 onSuccess: () => {
                     refetch();
+                    showAlert('User activated successfully', 'success');
                     setLoading(false);
                 },
                 onError: (error) => {
-                    console.error('Error activating user:', error);
+                    showAlert('Failed to activate user', 'error');
+                    setLoading(false);
                 },
             }
         );
     };
 
-    const handleRoleChanged = () => {
+    const handleRoleChanged = async () => {
         setLoading(true);
-        refetch();
-        setLoading(false)
+
+        try {
+            await refetch();
+
+            if (isError) {
+                showAlert('Failed to change role', 'error');
+            } else if (data) {
+                showAlert('Role changed successfully', 'success');
+            }
+        } catch (error) {
+            showAlert('Failed to change role', 'error');
+        } finally {
+            setLoading(false);
+        }
     };
 
     const handleMenu = async (