diff --git a/www/js/app.js b/www/js/app.js
index 1f50d3d99fcb4b56d0084c213a15272cfc5c9226..ee14fbf5e67cb476f98f03590a6042761732636e 100644
--- a/www/js/app.js
+++ b/www/js/app.js
@@ -46,20 +46,18 @@ angular.module('cesium', ['ionic', 'ionic-material', 'ngMessages', 'ngSanitize',
 
       // removeIf(android)
       // removeIf(ios)
-      // removeIf(firefoxos)
       // -- Automatic redirection to large state (if define) (keep this code for platforms web and ubuntu build)
       if (next.data.large && !UIUtils.screen.isSmall()) {
         event.preventDefault();
         $state.go(next.data.large, nextParams);
         return;
       }
-      // endRemoveIf(firefoxos)
       // endRemoveIf(ios)
       // endRemoveIf(android)
 
-      var wallet = nextParams.wallet && nextParams.wallet != "default" ? csWallet.children.get(nextParams.wallet) : csWallet;
+      var wallet = nextParams.wallet && nextParams.wallet !== 'default' ? csWallet.children.get(nextParams.wallet) : csWallet;
       if (nextParams.wallet && !wallet) {
-        console.warn("[app] Unable to find the children wallet: " + nextParams.wallet);
+        console.warn('[app] Unable to find the children wallet: ' + nextParams.wallet);
       }
       var goNextState = function() {
         preventStateChange = false;
@@ -94,7 +92,7 @@ angular.module('cesium', ['ionic', 'ionic-material', 'ngMessages', 'ngSanitize',
         event.preventDefault();
         options = next.data.minData ? {minData: true} : undefined;
         preventStateChange = true;
-        console.debug("[app] State need login...");
+        console.debug('[app] State need login...');
         return csWallet.login(options)
           .then(goNextState)
           .catch(processError);
@@ -108,7 +106,7 @@ angular.module('cesium', ['ionic', 'ionic-material', 'ngMessages', 'ngSanitize',
           // Show loading message, when full load
           if (!options || !options.minData) UIUtils.loading.show();
 
-          console.debug("[app] State load wallet data...");
+          console.debug('[app] State load wallet data...');
           return wallet.loadData(options)
             .then(goNextState)
             .catch(processError);
diff --git a/www/js/services/wallet-services.js b/www/js/services/wallet-services.js
index 4aa82fae1d02eefa7c92c4f65a61e07d8dfb4933..46843ef0dc0b8e5848e7e355c2784a63b2ebf1d1 100644
--- a/www/js/services/wallet-services.js
+++ b/www/js/services/wallet-services.js
@@ -2362,9 +2362,15 @@ angular.module('cesium.wallet.services', ['ngApi', 'ngFileSaver', 'cesium.bma.se
     }
 
     function stop() {
+      var wasLogin = isLogin();
+      var wasAuth = isAuth();
       console.debug('[wallet] Stopping...');
       removeListeners();
       resetData();
+
+      // Send logout/unauth events
+      if (wasLogin) api.data.raise.logout();
+      if (wasAuth) api.data.raise.unauth();
     }
 
     function restart() {
diff --git a/www/templates/settings/settings.html b/www/templates/settings/settings.html
index 8edb5e3405b7bfc960b05d907e673b08402c209b..d2aca053007ab2a5cf02f6d3fd6e4e28e7dfb34c 100644
--- a/www/templates/settings/settings.html
+++ b/www/templates/settings/settings.html
@@ -161,18 +161,18 @@
           {{'SETTINGS.WALLETS_SETTINGS' | translate}}
         </span>
 
-          <div class="item item-toggle item-text-wrap dark hidden-readonly">
-            <span class="input-label" ng-class="{'gray': !formData.useLocalStorage}" translate>SETTINGS.USE_WALLETS_ENCRYPTION</span>
-            <h4 class="gray text-wrap" ng-bind-html="'SETTINGS.USE_WALLETS_ENCRYPTION_HELP' | translate">
-            </h4>
-            <label class="toggle toggle-royal">
-              <input type="checkbox" ng-model="formData.useLocalStorageEncryption" ng-if="formData.useLocalStorage">
-              <input type="checkbox" ng-model="formData.useLocalStorage" ng-if="!formData.useLocalStorage" disabled>
-              <div class="track">
-                <div class="handle"></div>
-              </div>
-            </label>
-          </div>
+        <div class="item item-toggle item-text-wrap dark hidden-readonly">
+          <span class="input-label" ng-class="{'gray': !formData.useLocalStorage}" translate>SETTINGS.USE_WALLETS_ENCRYPTION</span>
+          <h4 class="gray text-wrap" ng-bind-html="'SETTINGS.USE_WALLETS_ENCRYPTION_HELP' | translate">
+          </h4>
+          <label class="toggle toggle-royal">
+            <input type="checkbox" ng-model="formData.useLocalStorageEncryption" ng-if="formData.useLocalStorage">
+            <input type="checkbox" ng-model="formData.useLocalStorage" ng-if="!formData.useLocalStorage" disabled>
+            <div class="track">
+              <div class="handle"></div>
+            </div>
+          </label>
+        </div>
 
         <span class="item item-divider hidden-readonly" translate>SETTINGS.HISTORY_SETTINGS</span>