Don't dereference null ImapUser in new getlogin function.

diff --git a/account.c b/account.c
index 3b4a4fa97009658a2d44e1e183462ecbdaca0b1a..a71746b774eb974974e1a8a904253d9654a50845 100644 (file)
--- 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