diff --git a/www/plugins/es/i18n/locale-en-GB.json b/www/plugins/es/i18n/locale-en-GB.json
index 6ab370203e4c7b33cd770104ac7aa620946b7e5c..6f3ae1c34fe5d54ca43b92741099d3589b759e22 100644
--- a/www/plugins/es/i18n/locale-en-GB.json
+++ b/www/plugins/es/i18n/locale-en-GB.json
@@ -99,7 +99,7 @@
       "REMOVE_INVITATION_FAILED": "Error while deleting the invitation",
       "REMOVE_ALL_INVITATIONS_FAILED": "Error while deleting invitations",
       "SEND_INVITATION_FAILED": "Error while sending invitation",
-      "BAD_INVITATION_FORMAT": "<span class=\"assertive\"><i class=\"ion-close-circled\"></i> Invitation unreadable (format unknown)</span> - sent by <a href=\"#/app/wot/{{pubkey}}/{{::uid}}\">{{::name||uid||pubkey}}</a>"
+      "BAD_INVITATION_FORMAT": "<span class=\"assertive\"><i class=\"ion-close-circled\"></i> Invitation unreadable (format unknown)</span> - sent by <a ui-sref=\"app.wot_identity({pubkey: '{{::pubkey}}', uid: '{{::uid}}' })\">{{::name||uid}}</a>"
     }
   },
   "COMMENTS": {
diff --git a/www/plugins/es/i18n/locale-en.json b/www/plugins/es/i18n/locale-en.json
index 6ab370203e4c7b33cd770104ac7aa620946b7e5c..6f3ae1c34fe5d54ca43b92741099d3589b759e22 100644
--- a/www/plugins/es/i18n/locale-en.json
+++ b/www/plugins/es/i18n/locale-en.json
@@ -99,7 +99,7 @@
       "REMOVE_INVITATION_FAILED": "Error while deleting the invitation",
       "REMOVE_ALL_INVITATIONS_FAILED": "Error while deleting invitations",
       "SEND_INVITATION_FAILED": "Error while sending invitation",
-      "BAD_INVITATION_FORMAT": "<span class=\"assertive\"><i class=\"ion-close-circled\"></i> Invitation unreadable (format unknown)</span> - sent by <a href=\"#/app/wot/{{pubkey}}/{{::uid}}\">{{::name||uid||pubkey}}</a>"
+      "BAD_INVITATION_FORMAT": "<span class=\"assertive\"><i class=\"ion-close-circled\"></i> Invitation unreadable (format unknown)</span> - sent by <a ui-sref=\"app.wot_identity({pubkey: '{{::pubkey}}', uid: '{{::uid}}' })\">{{::name||uid}}</a>"
     }
   },
   "COMMENTS": {
diff --git a/www/plugins/es/i18n/locale-es-ES.json b/www/plugins/es/i18n/locale-es-ES.json
index 4e39c2fc643744ebb749615f4c0c259d1c2fdeaf..2192a1268e2b983cc2e691164b183b73ba90bbb0 100644
--- a/www/plugins/es/i18n/locale-es-ES.json
+++ b/www/plugins/es/i18n/locale-es-ES.json
@@ -93,7 +93,7 @@
       "REMOVE_INVITATION_FAILED": "Fracaso durante la supresión de la invitación",
       "REMOVE_ALL_INVITATIONS_FAILED": "Fracaso durante la supresión de las invitaciónes",
       "SEND_INVITATION_FAILED": "Fracaso durante el envío de la invitación",
-      "BAD_INVITATION_FORMAT": "<span class=\"assertive\"><i class=\"ion-close-circled\"></i> Invitación ilegible (formato desconocido)</span> - mandada por <a href=\"#/app/wot/{{pubkey}}/{{::uid}}\">{{::name||uid}}</a>"
+      "BAD_INVITATION_FORMAT": "<span class=\"assertive\"><i class=\"ion-close-circled\"></i> Invitación ilegible (formato desconocido)</span> - mandada por <a ui-sref=\"app.wot_identity({pubkey: '{{::pubkey}}', uid: '{{::uid}}' })\">{{::name||uid}}</a>"
     }
   },
   "COMMENTS": {
diff --git a/www/plugins/es/i18n/locale-fr-FR.json b/www/plugins/es/i18n/locale-fr-FR.json
index 561c254073b76eaaa3a4f53e8177a803d9511cbc..9df790aa5b109f3eb428675ba2ed91f16c160d49 100644
--- a/www/plugins/es/i18n/locale-fr-FR.json
+++ b/www/plugins/es/i18n/locale-fr-FR.json
@@ -99,7 +99,7 @@
       "REMOVE_INVITATION_FAILED": "Erreur lors de la suppression de l'invitation",
       "REMOVE_ALL_INVITATIONS_FAILED": "Erreur lors de la suppression des invitations",
       "SEND_INVITATION_FAILED": "Erreur lors de l'envoi de l'invitation",
-      "BAD_INVITATION_FORMAT": "<span class=\"assertive\"><i class=\"ion-close-circled\"></i> Invitation illisible (format inconnu)</span> - envoyée par <a href=\"#/app/wot/{{pubkey}}/{{::uid}}\">{{::name||uid}}</a>"
+      "BAD_INVITATION_FORMAT": "<span class=\"assertive\"><i class=\"ion-close-circled\"></i> Invitation illisible (format inconnu)</span> - envoyée par <a ui-sref=\"app.wot_identity({pubkey: '{{::pubkey}}', uid: '{{::uid}}' })\">{{::name||uid}}</a>"
     }
   },
   "COMMENTS": {
diff --git a/www/plugins/es/js/controllers/app-controllers.js b/www/plugins/es/js/controllers/app-controllers.js
index ba52ffc29d482e46efc0c99b38dbcd0246f01fcf..fa4fd0f95336b6241475b67a13033678adb857ac 100644
--- a/www/plugins/es/js/controllers/app-controllers.js
+++ b/www/plugins/es/js/controllers/app-controllers.js
@@ -125,8 +125,6 @@ function ESMenuExtendController($scope, $state, PluginService, esSettings, UIUti
           popover.scope.closePopover();
         });
       }
-    })
-      .then(function() {
     });
   };
 
diff --git a/www/plugins/es/js/controllers/invitation-controllers.js b/www/plugins/es/js/controllers/invitation-controllers.js
index 1f1392c17245f776590d11079cea04b87b768873..fc4c8ec4d9d0ea2874988ddbfa8f40e33643171b 100644
--- a/www/plugins/es/js/controllers/invitation-controllers.js
+++ b/www/plugins/es/js/controllers/invitation-controllers.js
@@ -194,6 +194,11 @@ function InvitationsController($scope, $q, $ionicPopover, $state, $timeout, UIUt
   $scope.showNewInvitationModal = function() {
     $scope.hideActionsPopover();
 
+    // Not allow for non-member - issue #561
+    if (!csWallet.data.isMember) {
+      return UIUtils.alert.error('ERROR.ONLY_MEMBER_CAN_EXECUTE_THIS_ACTION');
+    }
+
     esModals.showNewInvitation({});
   };
 
diff --git a/www/plugins/es/js/controllers/message-controllers.js b/www/plugins/es/js/controllers/message-controllers.js
index 11d769af25a3eddb1722e0d8019499902ce68922..9279da555949c00217aebe379ec7316381420692 100644
--- a/www/plugins/es/js/controllers/message-controllers.js
+++ b/www/plugins/es/js/controllers/message-controllers.js
@@ -61,7 +61,7 @@ angular.module('cesium.es.message.controllers', ['cesium.es.services'])
 ;
 
 function ESMessageListController($scope, $state, $translate, $ionicHistory, $ionicPopover, $timeout,
-                                 esModals, UIUtils, esMessage) {
+                                 csWallet, esModals, UIUtils, esMessage) {
   'ngInject';
 
   $scope.loading = true;
@@ -267,7 +267,7 @@ function ESMessageListController($scope, $state, $translate, $ionicHistory, $ion
 
   // Watch received message
   $scope.onNewInboxMessage = function(notification) {
-    if ($scope.type != 'inbox') return;
+    if ($scope.type != 'inbox' || !$scope.entered) return;
     // Add message sent to list
     $scope.loading = true;
     // Load the the message
@@ -283,6 +283,15 @@ function ESMessageListController($scope, $state, $translate, $ionicHistory, $ion
   };
   esMessage.api.data.on.new($scope, $scope.onNewInboxMessage);
 
+  // Watch unauth
+  $scope.onUnauth = function() {
+    // Reset all data
+    $scope.messages = undefined;
+    $scope.loading = false;
+    $scope.entered = false;
+  };
+  csWallet.api.data.on.unauth($scope, $scope.onUnauth);
+
   // for DEV only
   /*$timeout(function() {
     $scope.showNewMessageModal();
diff --git a/www/plugins/es/js/entities/invitation.js b/www/plugins/es/js/entities/invitation.js
index 906de99f09f943bbb95ea2049d57d4ab9f1ec8d9..1bba5d2d935644abbb04287cdd1d90ac5828fe19 100644
--- a/www/plugins/es/js/entities/invitation.js
+++ b/www/plugins/es/js/entities/invitation.js
@@ -63,7 +63,6 @@ function Invitation(json) {
       that.uid = identity.uid;
     }
 
-
   }
 
 }
diff --git a/www/plugins/es/js/services/invitation-services.js b/www/plugins/es/js/services/invitation-services.js
index 99ec0291499e5e6d9813c7dd6f56efb2d3f300e4..c267967c8d0d3401bccb45eb8d76966e9d3075a9 100644
--- a/www/plugins/es/js/services/invitation-services.js
+++ b/www/plugins/es/js/services/invitation-services.js
@@ -94,6 +94,15 @@ angular.module('cesium.es.invitation.services', ['cesium.platform',
   function onNewInvitationEvent(event) {
     console.debug("[ES] [invitation] detected new invitation (from notification service)");
 
+    // If user not auth: simply increment counter
+    if (!csWallet.isAuth()) {
+      $rootScope.$apply(function() {
+        csWallet.data.invitations = csWallet.data.invitations || {};
+        csWallet.data.invitations.unreadCount++;
+      });
+      return;
+    }
+
     getInvitationById(event.reference.id, event.reference.type)
       .then(function(invitation){
         csWallet.data.invitations = csWallet.data.invitations || {};
diff --git a/www/plugins/es/js/services/settings-services.js b/www/plugins/es/js/services/settings-services.js
index 98462476afbca2bec9206206b99f7bb8eeb5e0e9..7fad3ccc980048961e84b89eb9d1788416cb2ebd 100644
--- a/www/plugins/es/js/services/settings-services.js
+++ b/www/plugins/es/js/services/settings-services.js
@@ -236,6 +236,10 @@ angular.module('cesium.es.settings.services', ['cesium.services', 'cesium.es.htt
         var boxKeypair = res[0];
         var nonce = res[1];
 
+        // Make sure user has not disconnect
+        // This can occur, when auth + disabling ES plugin in settings
+        if (!boxKeypair.boxPk || !boxKeypair.boxSk) return;
+
         var record = {
           issuer: csWallet.data.pubkey,
           nonce: CryptoUtils.util.encode_base58(nonce),
@@ -243,7 +247,6 @@ angular.module('cesium.es.settings.services', ['cesium.services', 'cesium.es.htt
         };
 
         //console.debug("Will store settings remotely: ", filteredData);
-
         var json = JSON.stringify(filteredData);
 
         return CryptoUtils.box.pack(json, nonce, boxKeypair.boxPk, boxKeypair.boxSk)
@@ -253,9 +256,13 @@ angular.module('cesium.es.settings.services', ['cesium.services', 'cesium.es.htt
             return !data.time ?
               that.add(record) :
               that.update(record, {id: record.issuer});
+          })
+          .then(function() {
+            return true;
           });
       })
-      .then(function() {
+      .then(function(saved) {
+        if (!saved) return;
         // Update settings version, then store (on local store only)
         csSettings.data.time = time;
         previousRemoteData = filteredData;