diff --git a/bin/pt-config-diff b/bin/pt-config-diff
index 4de976fa..f263b2de 100755
--- a/bin/pt-config-diff
+++ b/bin/pt-config-diff
@@ -2295,7 +2295,7 @@ sub new {
       set             => $args{set},
       NAME_lc         => defined($args{NAME_lc}) ? $args{NAME_lc} : 1,
       dbh_set         => 0,
-      ask_pass        => $args{ask_pass},
+      ask_pass        => $o->get('ask-pass') || $args{ask_pass},
       DSNParser       => $dp,
       is_cluster_node => undef,
       parent          => $args{parent},
diff --git a/bin/pt-deadlock-logger b/bin/pt-deadlock-logger
index e9140b02..cc8eca2d 100755
--- a/bin/pt-deadlock-logger
+++ b/bin/pt-deadlock-logger
@@ -2639,7 +2639,7 @@ sub new {
       set             => $args{set},
       NAME_lc         => defined($args{NAME_lc}) ? $args{NAME_lc} : 1,
       dbh_set         => 0,
-      ask_pass        => $args{ask_pass},
+      ask_pass        => $o->get('ask-pass') || $args{ask_pass},
       DSNParser       => $dp,
       is_cluster_node => undef,
       parent          => $args{parent},
diff --git a/bin/pt-fk-error-logger b/bin/pt-fk-error-logger
index 14b43289..96d4e09f 100755
--- a/bin/pt-fk-error-logger
+++ b/bin/pt-fk-error-logger
@@ -1791,7 +1791,7 @@ sub new {
       set             => $args{set},
       NAME_lc         => defined($args{NAME_lc}) ? $args{NAME_lc} : 1,
       dbh_set         => 0,
-      ask_pass        => $args{ask_pass},
+      ask_pass        => $o->get('ask-pass') || $args{ask_pass},
       DSNParser       => $dp,
       is_cluster_node => undef,
       parent          => $args{parent},
diff --git a/bin/pt-kill b/bin/pt-kill
index c7e5482b..db73976d 100755
--- a/bin/pt-kill
+++ b/bin/pt-kill
@@ -5158,7 +5158,7 @@ sub new {
       set             => $args{set},
       NAME_lc         => defined($args{NAME_lc}) ? $args{NAME_lc} : 1,
       dbh_set         => 0,
-      ask_pass        => $args{ask_pass},
+      ask_pass        => $o->get('ask-pass') || $args{ask_pass},
       DSNParser       => $dp,
       is_cluster_node => undef,
       parent          => $args{parent},
diff --git a/bin/pt-online-schema-change b/bin/pt-online-schema-change
index 67aa5343..fb4c3b23 100755
--- a/bin/pt-online-schema-change
+++ b/bin/pt-online-schema-change
@@ -3755,7 +3755,7 @@ sub new {
       set             => $args{set},
       NAME_lc         => defined($args{NAME_lc}) ? $args{NAME_lc} : 1,
       dbh_set         => 0,
-      ask_pass        => $args{ask_pass},
+      ask_pass        => $o->get('ask-pass') || $args{ask_pass},
       DSNParser       => $dp,
       is_cluster_node => undef,
       parent          => $args{parent},
@@ -7963,6 +7963,7 @@ sub main {
    };
 
    my $cxn     = $make_cxn->(dsn => $dsn);
+   $o->set('ask-pass', 0); # so we don't ask twice (password is already stored in dsn)
    my $aux_cxn = $make_cxn->(dsn => $dsn, prev_dsn => $dsn);
 
    my $cluster = Percona::XtraDB::Cluster->new;
diff --git a/bin/pt-table-checksum b/bin/pt-table-checksum
index 3adee83e..4f376898 100755
--- a/bin/pt-table-checksum
+++ b/bin/pt-table-checksum
@@ -3533,7 +3533,7 @@ sub new {
       set             => $args{set},
       NAME_lc         => defined($args{NAME_lc}) ? $args{NAME_lc} : 1,
       dbh_set         => 0,
-      ask_pass        => $args{ask_pass},
+      ask_pass        => $o->get('ask-pass') || $args{ask_pass},
       DSNParser       => $dp,
       is_cluster_node => undef,
       parent          => $args{parent},
diff --git a/bin/pt-upgrade b/bin/pt-upgrade
index cf04c82b..57803988 100755
--- a/bin/pt-upgrade
+++ b/bin/pt-upgrade
@@ -2464,7 +2464,7 @@ sub new {
       set             => $args{set},
       NAME_lc         => defined($args{NAME_lc}) ? $args{NAME_lc} : 1,
       dbh_set         => 0,
-      ask_pass        => $args{ask_pass},
+      ask_pass        => $o->get('ask-pass') || $args{ask_pass},
       DSNParser       => $dp,
       is_cluster_node => undef,
       parent          => $args{parent},
diff --git a/lib/Cxn.pm b/lib/Cxn.pm
index b8dc7168..41c8f543 100644
--- a/lib/Cxn.pm
+++ b/lib/Cxn.pm
@@ -108,7 +108,7 @@ sub new {
       set             => $args{set},
       NAME_lc         => defined($args{NAME_lc}) ? $args{NAME_lc} : 1,
       dbh_set         => 0,
-      ask_pass        => $args{ask_pass},
+      ask_pass        => $o->get('ask-pass') || $args{ask_pass},
       DSNParser       => $dp,
       is_cluster_node => undef,
       parent          => $args{parent},