diff --git a/frontend/src/ManageOrgUsers/ManageOrgUsers.jsx b/frontend/src/ManageOrgUsers/ManageOrgUsers.jsx
index 619af96a39..3a7deb2760 100644
--- a/frontend/src/ManageOrgUsers/ManageOrgUsers.jsx
+++ b/frontend/src/ManageOrgUsers/ManageOrgUsers.jsx
@@ -240,7 +240,7 @@ class ManageOrgUsers extends React.Component {
                             {users.map((user) => (
                               <tr key={user.id}>
                                 <td>
-                                  <span className="avatar bg-azure-lt avatar-sm">{user.first_name[0]}{user.last_name[0]}</span>
+                                  <span className="avatar bg-azure-lt avatar-sm">{user.first_name ? user.first_name[0]: ''}{user.last_name ? user.last_name[0] : ''}</span>
                                   <span className="mx-3" style={{display: 'inline-flex', marginBottom: '7px'}}>{user.name}</span>
                                 </td>
                                 <td className="text-muted">
diff --git a/frontend/src/_components/Header.jsx b/frontend/src/_components/Header.jsx
index 47e9241545..c365a8ef03 100644
--- a/frontend/src/_components/Header.jsx
+++ b/frontend/src/_components/Header.jsx
@@ -17,6 +17,8 @@ export const Header = function Header({
     history.push('/login');
   }
 
+  const { first_name, last_name } = authenticationService.currentUserValue;
+
   return <header className="navbar navbar-expand-md navbar-light d-print-none">
     <div className="container-xl">
       <button className="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbar-menu">
@@ -61,8 +63,8 @@ export const Header = function Header({
           >
             <div className="d-none d-xl-block ps-2">
               <span class="avatar bg-azure-lt">
-                {authenticationService.currentUserValue.first_name[0]}
-                {authenticationService.currentUserValue.last_name[0]}
+                {first_name ? first_name[0] : ''}
+                {last_name ? last_name[0] : ''}
               </span>
             </div>
           </a>