diff --git a/lib/swift b/lib/swift
index 21ed920149..15bd2a9471 100644
--- a/lib/swift
+++ b/lib/swift
@@ -557,9 +557,11 @@ function create_swift_disk {
 
 function create_swift_accounts {
     # Defines specific passwords used by tools/create_userrc.sh
-    local swiftusertest1_password=testing
-    local swiftusertest2_password=testing2
-    local swiftusertest3_password=testing3
+    # As these variables are used by create_userrc.sh, they must be exported
+    # The _password suffix is expected by create_userrc.sh
+    export swiftusertest1_password=testing
+    export swiftusertest2_password=testing2
+    export swiftusertest3_password=testing3
 
     KEYSTONE_CATALOG_BACKEND=${KEYSTONE_CATALOG_BACKEND:-sql}
 
diff --git a/tools/create_userrc.sh b/tools/create_userrc.sh
index 6a07be49f0..b43fd883a3 100755
--- a/tools/create_userrc.sh
+++ b/tools/create_userrc.sh
@@ -254,7 +254,8 @@ if [ $MODE != "create" ]; then
 
             # Checks for a specific password defined for an user.
             # Example for an username johndoe: JOHNDOE_PASSWORD=1234
-            eval SPECIFIC_UPASSWORD="\$${USER_NAME^^}_PASSWORD"
+            # This mechanism is used by lib/swift
+            eval SPECIFIC_UPASSWORD="\$${user_name}_password"
             if [ -n "$SPECIFIC_UPASSWORD" ]; then
                 USER_PASS=$SPECIFIC_UPASSWORD
             fi