diff --git a/lib/utils.robot b/lib/utils.robot
index e29e2de..d5e7422 100755
--- a/lib/utils.robot
+++ b/lib/utils.robot
@@ -504,8 +504,6 @@
 Create OS Console Command String
     [Documentation]  Return a command string to start OS console logging.
 
-    ${ssh_pw_file_path}=  Set Variable  ssh_pw
-
     # First make sure that the ssh_pw program is available.
     ${cmd_buf}=  Catenate  which ssh_pw 2>&1
     Rdpissuing  ${cmd_buf}
@@ -513,7 +511,9 @@
     Rdpvars  rc  output
 
     ${ssh_pw_file_path}=  Run Keyword If  ${rc} != ${0}
-    ...  Set Variable  ${EXECDIR}${/}bin/ssh_pw
+    ...    Set Variable  ${EXECDIR}${/}bin/ssh_pw
+    ...  ELSE
+    ...    Set Variable  ssh_pw
 
     ${cmd_buf}=  Catenate  ${ssh_pw_file_path} ${OPENBMC_PASSWORD} -p 2200
     ...  -o "StrictHostKeyChecking no" ${OPENBMC_USERNAME}@${OPENBMC_HOST}