diff --git a/gui/data/gui_variables.py b/gui/data/gui_variables.py
index 4e3087e..f45963a 100644
--- a/gui/data/gui_variables.py
+++ b/gui/data/gui_variables.py
@@ -63,3 +63,5 @@
     # Profile settings
     xpath_default_UTC = "//*[@data-test-id='profileSettings-radio-defaultUTC']"
     xpath_profile_save_button = "//*[@data-test-id='profileSettings-button-saveSettings']"
+    xpath_input_password = "//*[@data-test-id='profileSettings-input-newPassword']"
+    xpath_input_confirm_password = "//*[@data-test-id='profileSettings-input-confirmPassword']"
diff --git a/gui/lib/gui_resource.robot b/gui/lib/gui_resource.robot
index fb23cfc..a7dcd9c 100644
--- a/gui/lib/gui_resource.robot
+++ b/gui/lib/gui_resource.robot
@@ -97,7 +97,7 @@
 Logout GUI
     [Documentation]  Logout of OpenBMC GUI.
 
-    Click Element  ${xpath_user_header}
+    Click Element  ${xpath_root_button_menu}
     Click Element  ${xpath_logout_button}
     Wait Until Page Contains Element  ${xpath_login_button}