diff --git a/patroni/ctl.py b/patroni/ctl.py
index 3d457c9f..5da78388 100644
--- a/patroni/ctl.py
+++ b/patroni/ctl.py
@@ -252,6 +252,8 @@ def dsn(cluster_name, config_file, dcs, role, member):
 @option_format
 @click.option('--format', help='Output format (pretty, json)', default='tsv')
 @click.option('--file', '-f', help='Execute the SQL commands from this file', type=click.File('rb'))
+@click.option('--password', help='force password prompt', is_flag=True)
+@click.option('-U', '--username', help='database user name', type=str)
 @option_dcs
 @option_watch
 @option_watchrefresh
@@ -260,6 +262,7 @@ def dsn(cluster_name, config_file, dcs, role, member):
 @click.option('--member', '-m', help='Query a specific member', type=str)
 @click.option('--delimiter', help='The column delimiter', default='\t')
 @click.option('--command', '-c', help='The SQL commands to execute')
+@click.option('-d', '--dbname', help='database name to connect to', type=str)
 def query(
     cluster_name,
     config_file,
@@ -271,6 +274,9 @@ def query(
     delimiter,
     command,
     file,
+    password,
+    username,
+    dbname,
     format='tsv',
 ):
     if role is not None and member is not None:
@@ -281,6 +287,17 @@ def query(
     if file is not None and command is not None:
         raise PatroniCtlException('--file and --command are mutually exclusive options')
 
+    if file is None and command is None:
+        raise PatroniCtlException('You need to specify either --command or --file')
+
+    connect_parameters = dict()
+    if username:
+        connect_parameters['user'] = username
+    if password:
+        connect_parameters['password'] = click.prompt('Password', hide_input=True, type=str)
+    if dbname:
+        connect_parameters['database'] = dbname
+
     if file is not None:
         command = file.read()
 
@@ -289,17 +306,17 @@ def query(
     cursor = None
     for _ in watching(w, watch, clear=False):
 
-        output, cursor = query_member(cluster=cluster, cursor=cursor, member=member, role=role, command=command)
+        output, cursor = query_member(cluster=cluster, cursor=cursor, member=member, role=role, command=command, connect_parameters=connect_parameters)
         print_output(None, output, format=format, delimiter=delimiter)
 
         if cursor is None:
             cluster = dcs.get_cluster()
 
 
-def query_member(cluster, cursor, member, role, command):
+def query_member(cluster, cursor, member, role, command, connect_parameters):
     try:
         if cursor is None:
-            cursor = get_cursor(cluster, role=role, member=member)
+            cursor = get_cursor(cluster, role=role, member=member, connect_parameters=connect_parameters)
 
         if cursor is None:
             if role is None: