diff --git a/git-cvsimport.perl b/git-cvsimport.perl
index 593832d81..d7411151d 100755
--- a/git-cvsimport.perl
+++ b/git-cvsimport.perl
@@ -238,7 +238,9 @@ sub conn {
 		}
 		my $rr = ":pserver:$user\@$serv:$port$repo";
 
-		unless ($pass) {
+		if ($pass) {
+			$pass = $self->_scramble($pass);
+		} else {
 			open(H,$ENV{'HOME'}."/.cvspass") and do {
 				# :pserver:cvs@mea.tmt.tele.fi:/cvsroot/zmailer Ah<Z
 				while (<H>) {
@@ -253,8 +255,6 @@ sub conn {
 			};
 		}
 
-		$pass = $self->_scramble($pass);
-
 		my ($s, $rep);
 		if ($proxyhost) {