Don't dereference null ImapUser in new getlogin function.

1 files changed, 4 insertions, 2 deletions

diff --git a/account.c b/account.c
index 3b4a4fa9..a71746b7 100644
--- a/account.c
+++ b/account.c
@@ -172,8 +172,10 @@ int mutt_account_getlogin (ACCOUNT* account)
   {
     if (ImapLogin)
       strfcpy (account->login, ImapLogin, sizeof (account->login));
-    else
-      strfcpy (account->login, ImapUser, sizeof (account->login));
+    else {
+      mutt_account_getuser (account);
+      strfcpy (account->login, account->user, sizeof (account->login));
+    }
   }
 #endif