diff --git a/backends/eds/lib/edsf-persona-store.vala b/backends/eds/lib/edsf-persona-store.vala
index 0c6b9c1..f2925ea 100644
--- a/backends/eds/lib/edsf-persona-store.vala
+++ b/backends/eds/lib/edsf-persona-store.vala
@@ -52,6 +52,7 @@ public class Edsf.PersonaStore : Folks.PersonaStore
   private E.BookClientView? _ebookview = null; /* null before prepare() */
   private E.SourceRegistry? _source_registry = null; /* null before prepare() */
   private string _query_str;
+  private bool _auto_trust_level = true;
 
   /* The timeout after which we consider a property change to have failed if we
    * haven't received a property change notification for it. */
@@ -76,6 +77,27 @@ public class Edsf.PersonaStore : Folks.PersonaStore
   public override string type_id { get { return BACKEND_NAME; } }
 
   /**
+   * Specify if the persona store should auto detect the trust_level, based on
+   * store type or not.
+   */
+  public bool auto_trust_level
+    {
+      get
+        {
+          return this._auto_trust_level;
+        }
+
+      set
+        {
+          if (value != auto_trust_level)
+            {
+              this._auto_trust_level = value;
+              this.notify_property ("auto_trust_level");
+            }
+        }
+    }
+
+  /**
    * Create a new address book with the given ID.
    *
    * A new Address Book will be created with the given ID and the EDS
@@ -2581,6 +2603,11 @@ public class Edsf.PersonaStore : Folks.PersonaStore
    */
   private void _update_trust_level ()
     {
+      /* Skip the auto detect if this was disabled */
+      if (!this._auto_trust_level)
+        {
+          return;
+        }
       /* We may be called before prepare() has finished (and it may then fail),
        * but _addressbook should always be non-null when we're called. */
       assert (this._source_registry != null);
