diff --git a/lib/resource.txt b/lib/resource.txt
index 5e88bb1..698c34b 100755
--- a/lib/resource.txt
+++ b/lib/resource.txt
@@ -15,6 +15,8 @@
 ${AUTH_URI}       https://${OPENBMC_HOST}${AUTH_SUFFIX}
 ${OPENBMC_USERNAME}    root
 ${OPENBMC_PASSWORD}    0penBmc
+${REST_USERNAME}       root
+${REST_PASSWORD}       0penBmc
 ${IPMI_PASSWORD}       0penBmc
 ${MACHINE_TYPE}    palmetto
 ${DBUS_POLL_INTERVAL}      15s
diff --git a/lib/rest_client.robot b/lib/rest_client.robot
index 374d744..a19d8fe 100644
--- a/lib/rest_client.robot
+++ b/lib/rest_client.robot
@@ -118,8 +118,8 @@
 Initialize OpenBMC
     [Documentation]  Do a REST login connection within specified time.
     [Arguments]  ${timeout}=20  ${quiet}=${1}
-    ...  ${OPENBMC_USERNAME}=${OPENBMC_USERNAME}
-    ...  ${OPENBMC_PASSWORD}=${OPENBMC_PASSWORD}
+    ...  ${REST_USERNAME}=${REST_USERNAME}
+    ...  ${REST_PASSWORD}=${REST_PASSWORD}
 
     # Description of argument(s):
     # timeout  REST login attempt time out.
@@ -129,13 +129,13 @@
     # This will retry at 20 second interval.
     Wait Until Keyword Succeeds  40 sec  20 sec
     ...  Post Login Request  ${timeout}  ${quiet}
-    ...  ${OPENBMC_USERNAME}  ${OPENBMC_PASSWORD}
+    ...  ${REST_USERNAME}  ${REST_PASSWORD}
 
 Post Login Request
     [Documentation]  Do REST login request.
     [Arguments]  ${timeout}=20  ${quiet}=${1}
-    ...  ${OPENBMC_USERNAME}=${OPENBMC_USERNAME}
-    ...  ${OPENBMC_PASSWORD}=${OPENBMC_PASSWORD}
+    ...  ${REST_USERNAME}=${REST_USERNAME}
+    ...  ${REST_PASSWORD}=${REST_PASSWORD}
 
     # Description of argument(s):
     # timeout  REST login attempt time out.
@@ -143,7 +143,7 @@
 
     Create Session  openbmc  ${AUTH_URI}  timeout=${timeout}  max_retries=3
     ${headers}=  Create Dictionary  Content-Type=application/json
-    @{credentials}=  Create List  ${OPENBMC_USERNAME}  ${OPENBMC_PASSWORD}
+    @{credentials}=  Create List  ${REST_USERNAME}  ${REST_PASSWORD}
     ${data}=  create dictionary   data=@{credentials}
     ${status}  ${resp}=  Run Keyword And Ignore Error  Post Request  openbmc
     ...  /login  data=${data}  headers=${headers}