X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=account.c;h=aff9d3a341dff8cb58827da73941aff78d508ea8;hp=0499e0c03b9036a8a9e8c6c9b38ae776ac442eb6;hb=f32d447febdeb78039cd0da3ad91348f20dec721;hpb=b4827293ce79b576beb9550b91e71a198f2f5744

diff --git a/account.c b/account.c
index 0499e0c..aff9d3a 100644
--- a/account.c
+++ b/account.c
@@ -54,11 +54,11 @@ int mutt_account_match (const ACCOUNT * a1, const ACCOUNT * a2)
 #endif
 
   if (a1->flags & a2->flags & M_ACCT_USER)
-    return (!safe_strcmp (a1->user, a2->user));
+    return (!mutt_strcmp (a1->user, a2->user));
   if (a1->flags & M_ACCT_USER)
-    return (!safe_strcmp (a1->user, user));
+    return (!mutt_strcmp (a1->user, user));
   if (a2->flags & M_ACCT_USER)
-    return (!safe_strcmp (a2->user, user));
+    return (!mutt_strcmp (a2->user, user));
 
   return 1;
 }
@@ -178,8 +178,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