diff --git a/openstackclient/common/clientmanager.py b/openstackclient/common/clientmanager.py
index 9097543b14..57423aed6b 100644
--- a/openstackclient/common/clientmanager.py
+++ b/openstackclient/common/clientmanager.py
@@ -20,6 +20,7 @@ import pkg_resources
 import sys
 
 from osc_lib import clientmanager
+from osc_lib import shell
 
 
 LOG = logging.getLogger(__name__)
@@ -48,6 +49,8 @@ class ClientManager(clientmanager.ClientManager):
         super(ClientManager, self).__init__(
             cli_options=cli_options,
             api_version=api_version,
+            # TODO(dtroyer): Remove this when osc-lib 1.2 is released
+            pw_func=shell.prompt_for_password,
         )
 
         # TODO(dtroyer): For compatibility; mark this for removal when plugin
diff --git a/releasenotes/notes/bug-1617384-55c88207115e2a5b.yaml b/releasenotes/notes/bug-1617384-55c88207115e2a5b.yaml
new file mode 100644
index 0000000000..89b452be92
--- /dev/null
+++ b/releasenotes/notes/bug-1617384-55c88207115e2a5b.yaml
@@ -0,0 +1,5 @@
+---
+fixes:
+  - |
+    Fix prompting for password issue introduced in release 3.0.0
+    [Bug `1617384 <https://bugs.launchpad.net/bugs/1617384>`_]