Fix password prompt for POP (more authentication ID fallout).

diff --git a/account.c b/account.c
index a71746b774eb974974e1a8a904253d9654a50845..9647657dd572a1f83a228722c9a80629198de915 100644 (file)
--- a/account.c
+++ b/account.c
@@ -171,14 +171,19 @@ int mutt_account_getlogin (ACCOUNT* account)
   else if (account->type == M_ACCT_TYPE_IMAP)
   {
     if (ImapLogin)
+    {
       strfcpy (account->login, ImapLogin, sizeof (account->login));
-    else {
-      mutt_account_getuser (account);
-      strfcpy (account->login, account->user, sizeof (account->login));
+      account->flags |= M_ACCT_LOGIN;
     }
   }
 #endif
 
+  if (! account->flags & M_ACCT_LOGIN)
+  {
+    mutt_account_getuser (account);
+    strfcpy (account->login, account->user, sizeof (account->login));
+  }
+
   account->flags |= M_ACCT_LOGIN;
 
   return 0;
@@ -202,7 +207,8 @@ int mutt_account_getpass (ACCOUNT* account)
   else
   {
     snprintf (prompt, sizeof (prompt), _("Password for %s@%s: "),
-      account->login, account->host);
+              account->flags & M_ACCT_LOGIN ? account->login : account->user,
+              account->host);
     account->pass[0] = '\0';
     if (mutt_get_password (prompt, account->pass, sizeof (account->pass)))
       return -1;