diff --git a/check_junos_bgp.pl b/check_junos_bgp.pl
index 09f3a61..193e5ba 100755
--- a/check_junos_bgp.pl
+++ b/check_junos_bgp.pl
@@ -168,6 +168,7 @@ if (! $plugin->opts->password) {
 	chomp($conf{'password'});
 
 	$term->setlflag($lflag | POSIX::ECHO);
+	$term->setattr(fileno(STDIN), TCSAFLUSH);
 	print "\n";
 }
 
diff --git a/check_junos_vc.pl b/check_junos_vc.pl
index 23e67ad..d5a4422 100755
--- a/check_junos_vc.pl
+++ b/check_junos_vc.pl
@@ -170,6 +170,7 @@ if (! $plugin->opts->password) {
 	chomp($conf{'password'});
 
 	$term->setlflag($lflag | POSIX::ECHO);
+	$term->setattr(fileno(STDIN), TCSAFLUSH);
 	print "\n";
 }
 
diff --git a/perl/lib/Nagios/Plugin/JUNOS.pm b/perl/lib/Nagios/Plugin/JUNOS.pm
index 072cdd9..2b0f28d 100644
--- a/perl/lib/Nagios/Plugin/JUNOS.pm
+++ b/perl/lib/Nagios/Plugin/JUNOS.pm
@@ -346,6 +346,7 @@ sub connect
 		chomp($self->{'conf'}->{'password'});
 
 		$term->setlflag($lflag | POSIX::ECHO);
+		$term->setattr(fileno(STDIN), TCSAFLUSH);
 		print "\n";
 	}
 
diff --git a/perl/lib/Nagios/Plugin/NetApp.pm b/perl/lib/Nagios/Plugin/NetApp.pm
index c839183..789bb94 100644
--- a/perl/lib/Nagios/Plugin/NetApp.pm
+++ b/perl/lib/Nagios/Plugin/NetApp.pm
@@ -353,6 +353,7 @@ sub connect
 		chomp($self->{'conf'}->{'password'});
 
 		$term->setlflag($lflag | POSIX::ECHO);
+		$term->setattr(fileno(STDIN), TCSAFLUSH);
 		print "\n";
 	}