1 files changed, 3 insertions, 3 deletions
diff --git a/src/core/provider/MCAccountValidator.cpp b/src/core/provider/MCAccountValidator.cpp
index 9fbeabc4..a13dfd99 100644
--- a/src/core/provider/MCAccountValidator.cpp
+++ b/src/core/provider/MCAccountValidator.cpp
@@ -228,19 +228,19 @@ void AccountValidator::resolveMXDone()
 
 void AccountValidator::setupServices()
 {
-    if (mImapServices == NULL) {
+    if (mImapServices->count() == 0 && mProvider->imapServices() != NULL) {
         MC_SAFE_RELEASE(mImapServices);
         mImapServices = mProvider->imapServices();
         MC_SAFE_RETAIN(mImapServices);
     }
 
-    if (mPopServices == NULL) {
+    if (mPopServices->count() == 0 && mProvider->popServices() != NULL) {
         MC_SAFE_RELEASE(mPopServices);
         mPopServices = mProvider->popServices();
         MC_SAFE_RETAIN(mPopServices);
     }
 
-    if (mSmtpServices == NULL) {
+    if (mSmtpServices->count() == 0 && mProvider->smtpServices() != NULL) {
         MC_SAFE_RELEASE(mSmtpServices);
         mSmtpServices = mProvider->smtpServices();
         MC_SAFE_RETAIN(mSmtpServices);