diff --git a/packages/cli-repl/src/cli-repl.spec.ts b/packages/cli-repl/src/cli-repl.spec.ts
index 774f02a48e..45f12c3294 100644
--- a/packages/cli-repl/src/cli-repl.spec.ts
+++ b/packages/cli-repl/src/cli-repl.spec.ts
@@ -484,6 +484,7 @@ describe('CliRepl', () => {
       }
       expect(threw).to.be.true;
       expect(auth.password).to.equal('i want food');
+      expect(output).to.match(/^Enter password: \**$/m);
       input.write('.exit\n');
     });
 
diff --git a/packages/cli-repl/src/cli-repl.ts b/packages/cli-repl/src/cli-repl.ts
index c479fd3f5a..f4b39f2d85 100644
--- a/packages/cli-repl/src/cli-repl.ts
+++ b/packages/cli-repl/src/cli-repl.ts
@@ -367,7 +367,11 @@ class CliRepl {
     });
     this.output.write('Enter password: ');
     try {
-      (driverOptions.auth as any).password = (await passwordPromise).toString();
+      try {
+        (driverOptions.auth as any).password = (await passwordPromise).toString();
+      } finally {
+        this.output.write('\n');
+      }
     } catch (error) {
       await this._fatalError(error);
     }