diff --git a/www/i18n/locale-en.json b/www/i18n/locale-en.json
index 02e9c1eb3fb0f83fbf2ae11872dadbd799c67af9..7e683b611c47f15767dde388a2441424ed8af370 100644
--- a/www/i18n/locale-en.json
+++ b/www/i18n/locale-en.json
@@ -54,10 +54,11 @@
   },
   "SETTINGS": {
     "TITLE": "Setting",
-    "TECHNICAL_SETTINGS": "Technical settings",
-    "NODE": "Duniter Node",
+    "NETWORK_SETTINGS": "Network",
+    "NODE": "Node address",
     "NODE_HELP": "server.domain.com:port",
     "USE_LOCAL_STORAGE": "Enable local storage",
+    "AUTHENTICATION_SETTINGS": "Authentication",
     "REMEMBER_ME": "Remember me",
     "POPUP_NODE": {
       "TITLE" : "Duniter Node",
diff --git a/www/i18n/locale-fr-FR.json b/www/i18n/locale-fr-FR.json
index 3ac8c44ac3cbd84ff483471ad5d29da925afb5ac..da6ea34ebafdc797aea5368fbb921bed4cae9a99 100644
--- a/www/i18n/locale-fr-FR.json
+++ b/www/i18n/locale-fr-FR.json
@@ -54,10 +54,11 @@
   },
   "SETTINGS": {
     "TITLE": "Paramètres",
-    "TECHNICAL_SETTINGS": "Paramètres techniques",
-    "NODE": "Noeud Duniter",
+    "NETWORK_SETTINGS": "Réseau",
+    "NODE": "Adresse du noeud",
     "NODE_HELP": "server.domain.com:port",
     "USE_LOCAL_STORAGE": "Activer le stockage local",
+    "AUTHENTICATION_SETTINGS": "Authentification",
     "REMEMBER_ME": "Se rappeller de moi",
     "POPUP_NODE": {
       "TITLE" : "Noeud Duniter",
diff --git a/www/js/controllers/settings-controllers.js b/www/js/controllers/settings-controllers.js
index 7fcf6f7cf375cc975fa223ffcb55738a2889e927..54846aec73e28e35fcd215f272c85229abdcee79 100644
--- a/www/js/controllers/settings-controllers.js
+++ b/www/js/controllers/settings-controllers.js
@@ -125,8 +125,10 @@ function SettingsController($scope, $state, UIUtils, Wallet, $translate, BMA, $q
 
   $scope.onSettingsChanged = function() {
     if (!$scope.loading) {
+      $scope.loading = true;
       angular.merge(Wallet.data.settings, $scope.formData);
       Wallet.store();
+      $scope.loading = false;
     }
   };
   $scope.$watch('formData', $scope.onSettingsChanged, true);
diff --git a/www/templates/settings/settings.html b/www/templates/settings/settings.html
index 7348292335083b9433f71849ae8a3b22f7213027..9618ddd955a913477cf6f1e41debcdbd35562a08 100644
--- a/www/templates/settings/settings.html
+++ b/www/templates/settings/settings.html
@@ -4,13 +4,15 @@
 
     <ion-content >
         <div class="item item-toggle dark">
+          <div class="input-label">
             {{'COMMON.BTN_RELATIVE_UNIT' | translate}}
-            <label class="toggle toggle-royal">
-                <input type="checkbox" ng-model="formData.useRelative">
-                <div class="track">
-                    <div class="handle"></div>
-                </div>
-            </label>
+          </div>
+          <label class="toggle toggle-royal">
+              <input type="checkbox" ng-model="formData.useRelative">
+              <div class="track">
+                  <div class="handle"></div>
+              </div>
+          </label>
         </div>
 
       <label class="item item-input item-select">
@@ -24,9 +26,11 @@
       </label>
 
       <div class="item item-toggle dark">
-        {{'SETTINGS.REMEMBER_ME' | translate}}
+        <div class="input-label">
+         {{'SETTINGS.USE_LOCAL_STORAGE' | translate}}
+        </div>
         <label class="toggle toggle-royal">
-          <input type="checkbox" ng-model="formData.rememberMe" >
+          <input type="checkbox" ng-model="formData.useLocalStorage" >
           <div class="track">
             <div class="handle"></div>
           </div>
@@ -34,24 +38,32 @@
       </div>
 
       <span class="item item-divider">
-        {{'SETTINGS.TECHNICAL_SETTINGS' | translate}}
+        {{'SETTINGS.NETWORK_SETTINGS' | translate}}
       </span>
 
       <div class="item ink" ng-click="changeNode()">
+        <div class="input-label">
         {{'SETTINGS.NODE' | translate}}
+        </div>
         <span class="item-note">{{formData.node}}</span>
       </div>
 
-      <div class="item item-toggle dark">
-        {{'SETTINGS.USE_LOCAL_STORAGE' | translate}}
+      <span class="item item-divider" ng-if="formData.useLocalStorage">
+        {{'SETTINGS.AUTHENTICATION_SETTINGS' | translate}}
+      </span>
+
+      <div class="item item-toggle dark" ng-if="formData.useLocalStorage">
+        <div class="input-label">
+          {{'SETTINGS.REMEMBER_ME' | translate}}
+        </div>
         <label class="toggle toggle-royal">
-          <input type="checkbox" ng-model="formData.useLocalStorage" >
+          <input type="checkbox" ng-model="formData.rememberMe"
+            >
           <div class="track">
             <div class="handle"></div>
           </div>
         </label>
       </div>
 
-
     </ion-content>
 </ion-view>