diff --git a/os_brick/initiator/connectors/scaleio.py b/os_brick/initiator/connectors/scaleio.py
index 9a61406e7..fea7631e7 100644
--- a/os_brick/initiator/connectors/scaleio.py
+++ b/os_brick/initiator/connectors/scaleio.py
@@ -334,8 +334,10 @@ class ScaleIOConnector(base.BaseLinuxConnector):
         self.server_ip = connection_properties['serverIP']
         self.server_port = connection_properties['serverPort']
         self.server_username = connection_properties['serverUsername']
-        self.server_password, self.server_token = self._get_password_token(
+        self.server_password, server_token = self._get_password_token(
             connection_properties)
+        if server_token:
+            self.server_token = server_token
         self.iops_limit = connection_properties['iopsLimit']
         self.bandwidth_limit = connection_properties['bandwidthLimit']
         self.verify_certificate = (
diff --git a/releasenotes/notes/bug-2004630-e94616509a51258c.yaml b/releasenotes/notes/bug-2004630-e94616509a51258c.yaml
new file mode 100644
index 000000000..eeef86603
--- /dev/null
+++ b/releasenotes/notes/bug-2004630-e94616509a51258c.yaml
@@ -0,0 +1,8 @@
+---
+fixes:
+  - |
+    PowerFlex driver `bug #2004630
+    <https://bugs.launchpad.net/cinder/+bug/2004630>`_:
+    Fixed regression which caused the PowerFlex (ScaleIO) connector to
+    login multiple times, even with an existing valid token. The ScaleIO
+    connector now caches and reuses the token.