diff --git a/truenas_api_client/__init__.py b/truenas_api_client/__init__.py
index d5e59b5..c340586 100644
--- a/truenas_api_client/__init__.py
+++ b/truenas_api_client/__init__.py
@@ -32,6 +32,7 @@
 from base64 import b64decode
 from collections import defaultdict
 from collections.abc import Callable, Iterable
+from getpass import getpass
 import errno
 import logging
 import pickle
@@ -916,6 +917,9 @@ def main():
     iparser.add_argument('-t', '--timeout', type=int)
     args = parser.parse_args()
 
+    if args.username and not args.password:
+        args.password = getpass()
+
     def from_json(args):
         for i in args:
             try: