diff --git a/frontend/src/HomePage/HomePage.jsx b/frontend/src/HomePage/HomePage.jsx
index d6572cfed6..e7f7a860cf 100644
--- a/frontend/src/HomePage/HomePage.jsx
+++ b/frontend/src/HomePage/HomePage.jsx
@@ -29,6 +29,11 @@ class HomePage extends React.Component {
         });
     }
 
+    logout() {
+        authenticationService.logout();
+        history.push('/login');
+    }
+
     render() {
         const  { currentUser, users, apps, isLoading } = this.state;
         return (
@@ -73,7 +78,8 @@ class HomePage extends React.Component {
                         <div className="nav-item dropdown">
                             <a href="#" className="nav-link d-flex lh-1 text-reset p-0" data-bs-toggle="dropdown" aria-label="Open user menu">
                                 <div className="d-none d-xl-block ps-2">
-                                    <div>{this.state.currentUser.first_name}</div>
+                                    {/* <div>{this.state.currentUser.first_name}</div> */}
+                                    <span onClick={this.logout}>Logout</span>
                                 </div>
                             </a>
                             <div className="dropdown-menu dropdown-menu-end dropdown-menu-arrow">
diff --git a/frontend/src/ManageOrgUsers/ManageOrgUsers.jsx b/frontend/src/ManageOrgUsers/ManageOrgUsers.jsx
index 92ab8ebe0f..7780b53291 100644
--- a/frontend/src/ManageOrgUsers/ManageOrgUsers.jsx
+++ b/frontend/src/ManageOrgUsers/ManageOrgUsers.jsx
@@ -70,6 +70,11 @@ class ManageOrgUsers extends React.Component {
         });    
     }
 
+    logout() {
+        authenticationService.logout();
+        history.push('/login');
+    }
+
     render() {
         const { isLoading, showNewUserForm, creatingUser, users, newUser, idChangingRole } = this.state;
 
@@ -114,7 +119,8 @@ class ManageOrgUsers extends React.Component {
                             <div className="nav-item dropdown">
                                 <a href="#" className="nav-link d-flex lh-1 text-reset p-0" data-bs-toggle="dropdown" aria-label="Open user menu">
                                     <div className="d-none d-xl-block ps-2">
-                                    <div>{this.state.currentUser.first_name}</div>
+                                    {/* <div>{this.state.currentUser.first_name}</div> */}
+                                    <span onClick={this.logout}>Logout</span>
                                     </div>
                                 </a>
                                 <div className="dropdown-menu dropdown-menu-end dropdown-menu-arrow">