--- tramp.el.old	2005-10-16 02:47:24.652222400 -0500
+++ tramp.el	2005-10-16 02:47:44.971440000 -0500
@@ -5334,9 +5334,9 @@
   (process-send-string
    p (concat (tramp-read-passwd)
 	     (or (tramp-get-method-parameter
-		  tramp-current-method
-		  tramp-current-user
-		  tramp-current-host
+		  tramp-current-hop-method
+		  tramp-current-hop-user
+		  tramp-current-hop-host
 		  'tramp-password-end-of-line)
 		 tramp-default-password-end-of-line))))