diff --git a/core/src/main/groovy/com/muwire/core/MuWireSettings.groovy b/core/src/main/groovy/com/muwire/core/MuWireSettings.groovy
index 4da24897..808ae99c 100644
--- a/core/src/main/groovy/com/muwire/core/MuWireSettings.groovy
+++ b/core/src/main/groovy/com/muwire/core/MuWireSettings.groovy
@@ -98,7 +98,7 @@ class MuWireSettings {
         
         if (!trustSubscriptions.isEmpty()) {
             String encoded = trustSubscriptions.stream().
-                map(it.toBase64()).
+                map({it.toBase64()}).
                 collect(Collectors.joining(","))
             props.setProperty("trustSubscriptions", encoded)
         }
diff --git a/core/src/main/groovy/com/muwire/core/trust/TrustSubscriber.groovy b/core/src/main/groovy/com/muwire/core/trust/TrustSubscriber.groovy
index f65930f5..647ac491 100644
--- a/core/src/main/groovy/com/muwire/core/trust/TrustSubscriber.groovy
+++ b/core/src/main/groovy/com/muwire/core/trust/TrustSubscriber.groovy
@@ -46,10 +46,8 @@ class TrustSubscriber {
     
     void onTrustSubscriptionEvent(TrustSubscriptionEvent e) {
         if (!e.subscribe) {
-            settings.trustSubscriptions.remove(e.persona)
             remoteTrustLists.remove(e.persona.destination)
         } else {
-            settings.trustSubscriptions.add(e.persona)
             RemoteTrustList trustList = remoteTrustLists.putIfAbsent(e.persona.destination, new RemoteTrustList(e.persona))
             trustList?.timestamp = 0
             synchronized(waitLock) {
diff --git a/gui/griffon-app/controllers/com/muwire/gui/MainFrameController.groovy b/gui/griffon-app/controllers/com/muwire/gui/MainFrameController.groovy
index e618de2e..d49519c9 100644
--- a/gui/griffon-app/controllers/com/muwire/gui/MainFrameController.groovy
+++ b/gui/griffon-app/controllers/com/muwire/gui/MainFrameController.groovy
@@ -218,6 +218,8 @@ class MainFrameController {
         if (row < 0)
             return
         Persona p = model.trusted[row]
+        core.muOptions.trustSubscriptions.add(p)
+        saveMuWireSettings()
         core.eventBus.publish(new TrustSubscriptionEvent(persona : p, subscribe : true))
     }