diff --git a/e2e/cephfs_helper.go b/e2e/cephfs_helper.go
index 6deb976d10a..077e4d67ceb 100644
--- a/e2e/cephfs_helper.go
+++ b/e2e/cephfs_helper.go
@@ -127,10 +127,10 @@ func createCephfsSecret(f *framework.Framework, secretName, userName, userKey st
 	if secretName != "" {
 		sc.Name = secretName
 	}
-	sc.StringData["adminID"] = userName
-	sc.StringData["adminKey"] = userKey
-	delete(sc.StringData, "userID")
-	delete(sc.StringData, "userKey")
+	sc.StringData["userID"] = userName
+	sc.StringData["userKey"] = userKey
+	delete(sc.StringData, "adminID")
+	delete(sc.StringData, "adminKey")
 	sc.Namespace = cephCSINamespace
 	_, err = f.ClientSet.CoreV1().Secrets(cephCSINamespace).Create(context.TODO(), &sc, metav1.CreateOptions{})
 
diff --git a/internal/util/credentials.go b/internal/util/credentials.go
index fae403c2347..db613ba3054 100644
--- a/internal/util/credentials.go
+++ b/internal/util/credentials.go
@@ -110,6 +110,11 @@ func NewUserCredentials(secrets map[string]string) (*Credentials, error) {
 
 // NewAdminCredentials creates new admin credentials from secret.
 func NewAdminCredentials(secrets map[string]string) (*Credentials, error) {
+	// Use userID and userKey if found else fallback to adminID and adminKey
+	if cred, err := newCredentialsFromSecret(credUserID, credUserKey, secrets); err == nil {
+		return cred, nil
+	}
+
 	return newCredentialsFromSecret(credAdminID, credAdminKey, secrets)
 }