diff --git a/BACKEND/Modules/Admin/app/Http/Controllers/TicketController.php b/BACKEND/Modules/Admin/app/Http/Controllers/TicketController.php
index 4085cff..70283ff 100644
--- a/BACKEND/Modules/Admin/app/Http/Controllers/TicketController.php
+++ b/BACKEND/Modules/Admin/app/Http/Controllers/TicketController.php
@@ -284,7 +284,7 @@ class TicketController extends Controller
         $rules = [
             'ticket_id' => 'required',
             'action' => 'required',
-            'admin_note' => 'required'
+            // 'admin_note' => 'required'
         ];
 
         // Validate the request
diff --git a/FRONTEND/src/components/Navbar/Navbar.tsx b/FRONTEND/src/components/Navbar/Navbar.tsx
index afe19fd..a173cf3 100755
--- a/FRONTEND/src/components/Navbar/Navbar.tsx
+++ b/FRONTEND/src/components/Navbar/Navbar.tsx
@@ -183,7 +183,7 @@ const Navbar = ({
     confirm_password: '',
   })
   const [countSpam, setCountSpam] = useState(0)
-  const [avatar, setAvatar] = useState(user.user.avatar)
+  const [avatar, setAvatar] = useState(user?.user?.avatar)
 
   const navigate = useNavigate()
   const dispatch = useAppDispatch()
@@ -301,7 +301,7 @@ const Navbar = ({
         const res = await post(
           changePassword,
           {
-            email: user.user.email,
+            email: user?.user?.email,
             password: dataChange.password,
             new_password: dataChange.new_password,
             confirm_password: dataChange.confirm_password,
@@ -417,7 +417,7 @@ const Navbar = ({
                       cursor: 'pointer',
                     }}
                   >
-                    {user.user.name}
+                    {user?.user?.name}
                   </Code>
                 </Box>
                 <Box
@@ -569,7 +569,7 @@ const Navbar = ({
         <Box p="sm">
           <TextInput
             label="E-mail"
-            value={user.user.email}
+            value={user?.user?.email}
             disabled
             mb={'md'}
           ></TextInput>
diff --git a/FRONTEND/src/pages/TicketsManagement/TicketsManagement.tsx b/FRONTEND/src/pages/TicketsManagement/TicketsManagement.tsx
index 7f72d98..e5584dd 100755
--- a/FRONTEND/src/pages/TicketsManagement/TicketsManagement.tsx
+++ b/FRONTEND/src/pages/TicketsManagement/TicketsManagement.tsx
@@ -509,7 +509,7 @@ const TicketsManagement = () => {
 
             <Textarea
               label="Admin Notes"
-              required
+              // required
               value={form.values.admin_note}
               onChange={(e) => form.setFieldValue('admin_note', e.target.value)}
             />