diff --git a/python/understack-workflows/understack_workflows/bmc_credentials.py b/python/understack-workflows/understack_workflows/bmc_credentials.py
index d60716f71..1a2478eeb 100644
--- a/python/understack-workflows/understack_workflows/bmc_credentials.py
+++ b/python/understack-workflows/understack_workflows/bmc_credentials.py
@@ -49,7 +49,7 @@ def set_bmc_password(
         "Trying old / factory default credentials."
     )
 
-    for test_password in filter(None, [old_password, *FACTORY_PASSWORDS]):
+    for test_password in set(filter(None, [old_password, *FACTORY_PASSWORDS])):
         try:
             token, session = bmc.get_session(test_password)
         except RedfishRequestError as e:
diff --git a/workflows/argo-events/workflowtemplates/enroll-server.yaml b/workflows/argo-events/workflowtemplates/enroll-server.yaml
index c86a1f1fb..0b9b8acd2 100644
--- a/workflows/argo-events/workflowtemplates/enroll-server.yaml
+++ b/workflows/argo-events/workflowtemplates/enroll-server.yaml
@@ -27,6 +27,8 @@ spec:
         value: "false"
       - name: raid_configure
         value: "true"
+      - name: old_password
+        value: calvin
   templates:
     - name: main
       steps:
@@ -100,6 +102,8 @@ spec:
         args:
           - --bmc-ip-address
           - "{{workflow.parameters.ip_address}}"
+          - --old-bmc-password
+          - "{{workflow.parameters.old_password}}"
         volumeMounts:
           - mountPath: /etc/openstack
             name: baremetal-manage