diff --git a/index.html b/index.html
index 186c92917..17f39cece 100644
--- a/index.html
+++ b/index.html
@@ -598,25 +598,29 @@
             <label for="network-name">Livenet</label>
           </fieldset>
           <fieldset>
-            <legend>Blockchain</legend>
+            <legend>Insight API server</legend>
             <div class="row">
-              <label for="blockchain-host">Host</label>
-              <input type="text" ng-model="blockchainHost">
+              <label for="insight-host">Host</label>
+              <input type="text" ng-model="insightHost">
             </div>
             <div class="row">
-              <label for="blockchain-port">Port</label>
-              <input type="number" ng-model="blockchainPort">
+              <label for="insight-port">Port</label>
+              <input type="number" ng-model="insightPort">
             </div>
           </fieldset>
           <fieldset>
-            <legend>Socket</legend>
+            <legend>PeerJS server</legend>
             <div class="row">
-              <label for="socket-host">Host</label>
-              <input type="text" ng-model="socketHost">
+              <label for="peerjs-key">Host</label>
+              <input type="text" ng-model="networkKey">
+            </div>
+            <div class="row">
+              <label for="peerjs-host">Host</label>
+              <input type="text" ng-model="networkHost">
             </div>
             <div class="row">
               <label for="socket-port">Port</label>
-              <input type="number" ng-model="socketPort">
+              <input type="number" ng-model="networkPort">
             </div>
           </fieldset>
         </div>
diff --git a/js/controllers/settings.js b/js/controllers/settings.js
index 4db60ffd5..815494d5c 100644
--- a/js/controllers/settings.js
+++ b/js/controllers/settings.js
@@ -5,22 +5,29 @@ angular.module('copay.settings').controller('SettingsController',
     $scope.title = 'Settings';
 
     $scope.networkName = config.networkName;
-    $scope.blockchainHost = config.blockchain.host;
-    $scope.blockchainPort = config.blockchain.port;
-    $scope.socketHost = config.socket.host;
-    $scope.socketPort = config.socket.port;
+    $scope.insightHost = config.blockchain.host;
+    $scope.insightPort = config.blockchain.port;
+    $scope.networkKey = config.network.key;
+    $scope.networkHost = config.network.host;
+    $scope.networkPort = config.network.port;
 
     $scope.save = function() {
+      var network = config.network;
+      network.key = $scope.networkKey;
+      network.host = $scope.networkHost;
+      network.port = $scope.networkPort;
+
       localStorage.setItem('config', JSON.stringify({
           networkName: $scope.networkName,
           blockchain: {
-            host: $scope.blockchainHost,
-            port: $scope.blockchainPort
+            host: $scope.insightHost,
+            port: $scope.insightPort
           },
           socket: {
-            host: $scope.socketHost,
-            port: $scope.socketPort
-          }
+            host: $scope.insightHost,
+            port: $scope.insightPort
+          },
+          network: network
         })
       );