diff --git a/lib/ipmi_client.robot b/lib/ipmi_client.robot
index 47f0744..6e47168 100755
--- a/lib/ipmi_client.robot
+++ b/lib/ipmi_client.robot
@@ -118,6 +118,7 @@
     [Documentation]  Run the standard IPMI command in-band.
     [Arguments]  ${command}  ${fail_on_err}=${1}  ${os_host}=${OS_HOST}
     ...          ${os_username}=${OS_USERNAME}  ${os_password}=${OS_PASSWORD}
+    ...          ${login_host}=${1}
 
     # Description of argument(s):
     # command                       The IPMI command string to be executed
@@ -125,8 +126,10 @@
     # os_host                       The host name or IP address of the OS Host.
     # os_username                   The OS host user name.
     # os_password                   The OS host passwrd.
+    # login_host                    Indicates that this keyword should login to host OS.
 
-    Login To OS Host  ${os_host}  ${os_username}  ${os_password}
+    Run Keyword If  ${login_host} == ${1}
+    ...  Login To OS Host  ${os_host}  ${os_username}  ${os_password}
     Check If IPMI Tool Exist
 
     ${ipmi_cmd}=  Catenate  ${IPMI_INBAND_CMD}  ${command}