diff --git a/src/api/account.h b/src/api/account.h
index d9170888cb3e5fecfd9431339a5655e206375950..bdb329014f920442ebb3562b54ed99792b43e475 100644
--- a/src/api/account.h
+++ b/src/api/account.h
@@ -111,9 +111,7 @@ struct ConfProperties_t {
     std::string             userAgent;
     bool                    upnpEnabled;
     bool                    hasCustomUserAgent;
-    bool                    allowIncomingFromHistory;
-    bool                    allowIncomingFromContact;
-    bool                    allowIncomingFromTrusted;
+    bool                    allowIncoming;
     std::string             archivePassword;
     bool                    archiveHasPassword;
     std::string             archivePath;
diff --git a/src/newaccountmodel.cpp b/src/newaccountmodel.cpp
index 78b9c9fb57da50cc2c162aeb35638065667d01f7..4e9bb6bea8fa1002813669eadfee23180f3ab916 100644
--- a/src/newaccountmodel.cpp
+++ b/src/newaccountmodel.cpp
@@ -1,5 +1,5 @@
 /****************************************************************************
- *   Copyright (C) 2017-2018 Savoir-faire Linux                                  *
+ *   Copyright (C) 2017-2018 Savoir-faire Linux                             *
  *   Author: Nicolas Jäger <nicolas.jager@savoirfairelinux.com>             *
  *   Author: Sébastien Blin <sebastien.blin@savoirfairelinux.com>           *
  *                                                                          *
@@ -501,9 +501,9 @@ account::Info::fromDetails(const MapStringString& details)
     confProperties.userAgent                            = toStdString(details[ConfProperties::USER_AGENT]);
     confProperties.upnpEnabled                          = toBool(details[ConfProperties::UPNP_ENABLED]);
     confProperties.hasCustomUserAgent                   = toBool(details[ConfProperties::HAS_CUSTOM_USER_AGENT]);
-    confProperties.allowIncomingFromHistory             = toBool(details[ConfProperties::ALLOW_CERT_FROM_HISTORY]);
-    confProperties.allowIncomingFromContact             = toBool(details[ConfProperties::ALLOW_CERT_FROM_CONTACT]);
-    confProperties.allowIncomingFromTrusted             = toBool(details[ConfProperties::ALLOW_CERT_FROM_TRUSTED]);
+    confProperties.allowIncoming                        = toBool(details[ConfProperties::ALLOW_CERT_FROM_HISTORY])
+                                                        | toBool(details[ConfProperties::ALLOW_CERT_FROM_CONTACT])
+                                                        | toBool(details[ConfProperties::ALLOW_CERT_FROM_TRUSTED]);
     confProperties.archivePassword                      = toStdString(details[ConfProperties::ARCHIVE_PASSWORD]);
     confProperties.archiveHasPassword                   = toBool(details[ConfProperties::ARCHIVE_HAS_PASSWORD]);
     confProperties.archivePath                          = toStdString(details[ConfProperties::ARCHIVE_PATH]);
@@ -598,9 +598,9 @@ account::ConfProperties_t::toDetails() const
     details[ConfProperties::USER_AGENT]                 = toQString(this->userAgent);
     details[ConfProperties::UPNP_ENABLED]               = toQString(this->upnpEnabled);
     details[ConfProperties::HAS_CUSTOM_USER_AGENT]      = toQString(this->hasCustomUserAgent);
-    details[ConfProperties::ALLOW_CERT_FROM_HISTORY]    = toQString(this->allowIncomingFromHistory);
-    details[ConfProperties::ALLOW_CERT_FROM_CONTACT]    = toQString(this->allowIncomingFromContact);
-    details[ConfProperties::ALLOW_CERT_FROM_TRUSTED]    = toQString(this->allowIncomingFromTrusted);
+    details[ConfProperties::ALLOW_CERT_FROM_HISTORY]    = toQString(this->allowIncoming);
+    details[ConfProperties::ALLOW_CERT_FROM_CONTACT]    = toQString(this->allowIncoming);
+    details[ConfProperties::ALLOW_CERT_FROM_TRUSTED]    = toQString(this->allowIncoming);
     details[ConfProperties::ARCHIVE_PASSWORD]           = toQString(this->archivePassword);
     details[ConfProperties::ARCHIVE_HAS_PASSWORD]       = toQString(this->archiveHasPassword);
     details[ConfProperties::ARCHIVE_PATH]               = toQString(this->archivePath);