diff --git a/src/js/client.js b/src/js/client.js
index 1c417d8bb..b61247afc 100644
--- a/src/js/client.js
+++ b/src/js/client.js
@@ -867,11 +867,12 @@ angular.module('Application').service('Client', ['$http', '$interval', '$timeout
         });
     };
 
-    Client.prototype.restore = function (backupConfig, backupId, version, callback) {
+    Client.prototype.restore = function (backupConfig, backupId, version, sysinfoConfig, callback) {
         var data = {
             backupConfig: backupConfig,
             backupId: backupId,
-            version: version
+            version: version,
+            sysinfoConfig: sysinfoConfig
         };
 
         post('/api/v1/cloudron/restore', data, null, function (error, data, status) {
@@ -1194,14 +1195,15 @@ angular.module('Application').service('Client', ['$http', '$interval', '$timeout
         });
     };
 
-    Client.prototype.setup = function (domain, zoneName, provider, config, tlsConfig, callback) {
+    Client.prototype.setup = function (domain, zoneName, provider, config, tlsConfig, sysinfoConfig, callback) {
         var data = {
             dnsConfig: {
                 domain: domain,
                 zoneName: zoneName,
                 provider: provider,
                 config: config,
-                tlsConfig: tlsConfig
+                tlsConfig: tlsConfig,
+                sysinfoConfig: sysinfoConfig
             }
         };
 
diff --git a/src/js/restore.js b/src/js/restore.js
index 834c3f398..c957fa08a 100644
--- a/src/js/restore.js
+++ b/src/js/restore.js
@@ -5,7 +5,7 @@
 /* global $ */
 
 // create main application module
-var app = angular.module('Application', ['angular-md5', 'ui-notification']);
+var app = angular.module('Application', ['angular-md5', 'ui-notification', 'ui.bootstrap']);
 
 app.filter('zoneName', function () {
     return function (domain) {
@@ -33,6 +33,28 @@ app.controller('RestoreController', ['$scope', 'Client', function ($scope, Clien
     $scope.instanceId = '';
     $scope.acceptSelfSignedCerts = false;
     $scope.format = 'tgz';
+    $scope.advancedVisible = false;
+
+    $scope.sysinfo = {
+        provider: 'generic',
+        ip: '',
+        ifname: ''
+    };
+
+    $scope.sysinfoProvider = [
+        { name: 'Public IP', value: 'generic' },
+        { name: 'Static IP Address', value: 'fixed' },
+        { name: 'Network Interface', value: 'network-interface' }
+    ];
+
+    $scope.prettySysinfoProviderName = function (provider) {
+        switch (provider) {
+        case 'generic': return 'Public IP';
+        case 'fixed': return 'Static IP Address';
+        case 'network-interface': return 'Network Interface';
+        default: return 'Unknown';
+        }
+    };
 
     // List is from http://docs.aws.amazon.com/general/latest/gr/rande.html#s3_region
     $scope.s3Regions = [
@@ -187,7 +209,16 @@ app.controller('RestoreController', ['$scope', 'Client', function ($scope, Clien
             return;
         }
 
-        Client.restore(backupConfig, $scope.backupId.replace(/\.tar\.gz(\.enc)?$/, ''), version ? version[1] : '', function (error) {
+        var sysinfoConfig = {
+            provider: $scope.sysinfo.provider
+        };
+        if ($scope.sysinfo.provider === 'fixed') {
+            sysinfoConfig.ip = $scope.sysinfo.ip;
+        } else if ($scope.sysinfo.provider === 'network-interface') {
+            sysinfoConfig.ip = $scope.sysinfo.ifname;
+        }
+
+        Client.restore(backupConfig, $scope.backupId.replace(/\.tar\.gz(\.enc)?$/, ''), version ? version[1] : '', sysinfoConfig, function (error) {
             $scope.busy = false;
 
             if (error) {
diff --git a/src/js/setupdns.js b/src/js/setupdns.js
index 7fed7324d..83ce7d232 100644
--- a/src/js/setupdns.js
+++ b/src/js/setupdns.js
@@ -24,6 +24,8 @@ app.controller('SetupDNSController', ['$scope', '$http', '$timeout', 'Client', f
     $scope.isDomain = false;
     $scope.isSubdomain = false;
     $scope.hyphenatedSubdomains = false;
+    $scope.advancedVisible = false;
+
     $scope.tlsProvider = [
         { name: 'Let\'s Encrypt Prod', value: 'letsencrypt-prod' },
         { name: 'Let\'s Encrypt Prod - Wildcard', value: 'letsencrypt-prod-wildcard' },
@@ -32,6 +34,27 @@ app.controller('SetupDNSController', ['$scope', '$http', '$timeout', 'Client', f
         { name: 'Self-Signed', value: 'fallback' }, // this is not 'Custom' because we don't allow user to upload certs during setup phase
     ];
 
+    $scope.sysinfo = {
+        provider: 'generic',
+        ip: '',
+        ifname: ''
+    };
+
+    $scope.sysinfoProvider = [
+        { name: 'Public IP', value: 'generic' },
+        { name: 'Static IP Address', value: 'fixed' },
+        { name: 'Network Interface', value: 'network-interface' }
+    ];
+
+    $scope.prettySysinfoProviderName = function (provider) {
+        switch (provider) {
+        case 'generic': return 'Public IP';
+        case 'fixed': return 'Static IP Address';
+        case 'network-interface': return 'Network Interface';
+        default: return 'Unknown';
+        }
+    };
+
     $scope.needsPort80 = function (dnsProvider, tlsProvider) {
         return ((dnsProvider === 'manual' || dnsProvider === 'noop' || dnsProvider === 'wildcard') &&
             (tlsProvider === 'letsencrypt-prod' || tlsProvider === 'letsencrypt-staging'));
@@ -69,7 +92,6 @@ app.controller('SetupDNSController', ['$scope', '$http', '$timeout', 'Client', f
     ];
     $scope.dnsCredentials = {
         busy: false,
-        advancedVisible: false,
         domain: '',
         accessKeyId: '',
         secretAccessKey: '',
@@ -179,7 +201,16 @@ app.controller('SetupDNSController', ['$scope', '$http', '$timeout', 'Client', f
             tlsConfig.wildcard = true;
         }
 
-        Client.setup($scope.dnsCredentials.domain, $scope.dnsCredentials.zoneName, provider, data, tlsConfig, function (error) {
+        var sysinfoConfig = {
+            provider: $scope.sysinfo.provider
+        };
+        if ($scope.sysinfo.provider === 'fixed') {
+            sysinfoConfig.ip = $scope.sysinfo.ip;
+        } else if ($scope.sysinfo.provider === 'network-interface') {
+            sysinfoConfig.ip = $scope.sysinfo.ifname;
+        }
+
+        Client.setup($scope.dnsCredentials.domain, $scope.dnsCredentials.zoneName, provider, data, tlsConfig, sysinfoConfig, function (error) {
             if (error && error.statusCode === 401) {
                 $scope.dnsCredentials.busy = false;
                 $scope.error.ami = 'Wrong instance id provided.';
diff --git a/src/restore.html b/src/restore.html
index 3fe5bc270..0487470ea 100644
--- a/src/restore.html
+++ b/src/restore.html
@@ -30,6 +30,9 @@
     <!-- Angular directives for tldjs -->
     <script type="text/javascript" src="/3rdparty/js/tld.js"></script>
 
+    <!-- Angular directives for bootstrap https://angular-ui.github.io/bootstrap/ -->
+    <script type="text/javascript" src="/3rdparty/js/ui-bootstrap-tpls-1.3.3.min.js"></script>
+
     <!-- Setup Application -->
     <script type="text/javascript" src="/js/restore.js"></script>
 
@@ -164,10 +167,37 @@
                                 </div>
 
                                 <input class="ng-hide" type="submit" ng-disabled="configureBackupForm.$invalid"/>
+
+                                <div uib-collapse="!advancedVisible">
+                                    <div class="form-group">
+                                        <label class="control-label">IP Configuration  <sup><a href="https://cloudron.io/documentation/networking/#ip-configuration" class="help" target="_blank"><i class="fa fa-question-circle"></i></a></sup></label>
+                                        <select class="form-control" ng-model="sysinfo.provider" ng-options="a.value as a.name for a in sysinfoProvider"></select>
+                                    </div>
+
+                                    <!-- Fixed -->
+                                    <div class="form-group" ng-show="sysinfo.provider === 'fixed'" ng-class="{ 'has-error': error.ip }">
+                                        <label class="control-label">IP Address</label>
+                                        <input type="text" class="form-control" ng-model="sysinfo.ip" name="ip" ng-disabled="sysinfo.busy" ng-required="sysinfo.provider === 'fixed'">
+                                        <p class="has-error" ng-show="error.ip">{{ error.ip }}</p>
+                                    </div>
+
+                                    <!-- Network Interface -->
+                                    <div class="form-group" ng-show="sysinfo.provider === 'network-interface'" ng-class="{ 'has-error': error.ifname }">
+                                        <label class="control-label">Interface Name</label>
+                                        <input type="text" class="form-control" ng-model="sysinfo.ifname" name="ifname" ng-disabled="sysinfo.busy" ng-required="sysinfo.provider === 'network-interface'">
+                                        <p class="has-error" ng-show="error.ifname">{{ error.ifname }}</p>
+                                    </div>
+                                </div>
+
+                                <div class="text-center">
+                                    <a href="" ng-click="advancedVisible = true" ng-hide="advancedVisible">Advanced settings...</a>
+                                    <a href="" ng-click="advancedVisible = false" ng-show="advancedVisible">Hide Advanced settings</a>
+                                </div>
                             </div>
                         </div>
 
                         <br/>
+
                         <div class="row">
                             <div class="col-md-12 text-center">
                                 <button type="submit" class="btn btn-primary" ng-disabled="configureBackupForm.$invalid"/><i class="fa fa-circle-notch fa-spin" ng-show="busy"></i> Restore</button>
diff --git a/src/setupdns.html b/src/setupdns.html
index d37027369..a63f50b17 100644
--- a/src/setupdns.html
+++ b/src/setupdns.html
@@ -180,8 +180,7 @@
                                 <p class="small text-info" ng-show="needsPort80(dnsCredentials.provider, dnsCredentials.tlsConfig.provider)">Let's Encrypt requires your server to be reachable on port 80</p>
 
                                 <br/>
-                                <div  uib-collapse="!dnsCredentials.advancedVisible">
-
+                                <div uib-collapse="!advancedVisible">
                                     <div ng-show="false">
                                         <label>
                                             <input type="checkbox" ng-model="dnsCredentials.hyphenatedSubdomains" name="hyphenatedSubdomains" ng-disabled="dnsCredentials.busy"/>&nbsp; Hyphenate Subdomains
@@ -199,10 +198,29 @@
                                         <label class="control-label">Certificate Provider <sup><a href="https://cloudron.io/documentation/certificates/#certificate-providers" class="help" target="_blank"><i class="fa fa-question-circle"></i></a></sup></label>
                                         <select class="form-control" ng-model="dnsCredentials.tlsConfig.provider" ng-options="a.value as a.name for a in tlsProvider" ng-disabled="dnsCredentials.busy"></select>
                                     </div>
+
+                                    <div class="form-group">
+                                        <label class="control-label">IP Configuration  <sup><a href="https://cloudron.io/documentation/networking/#sysinfo" class="help" target="_blank"><i class="fa fa-question-circle"></i></a></sup></label>
+                                        <select class="form-control" ng-model="sysinfo.provider" ng-options="a.value as a.name for a in sysinfoProvider"></select>
+                                      </div>
+
+                                      <!-- Fixed -->
+                                      <div class="form-group" ng-show="sysinfo.provider === 'fixed'" ng-class="{ 'has-error': error.ip }">
+                                        <label class="control-label">IP Address</label>
+                                        <input type="text" class="form-control" ng-model="sysinfo.ip" name="ip" ng-disabled="sysinfo.busy" ng-required="sysinfo.provider === 'fixed'">
+                                        <p class="has-error" ng-show="error.ip">{{ error.ip }}</p>
+                                      </div>
+
+                                      <!-- Network Interface -->
+                                      <div class="form-group" ng-show="sysinfo.provider === 'network-interface'" ng-class="{ 'has-error': error.ifname }">
+                                        <label class="control-label">Interface Name</label>
+                                        <input type="text" class="form-control" ng-model="sysinfo.ifname" name="ifname" ng-disabled="sysinfo.busy" ng-required="sysinfo.provider === 'network-interface'">
+                                        <p class="has-error" ng-show="error.ifname">{{ error.ifname }}</p>
+                                      </div>
                                 </div>
                                 <div class="text-center">
-                                    <a href="" ng-click="dnsCredentials.advancedVisible = true" ng-hide="dnsCredentials.advancedVisible">Advanced settings...</a>
-                                    <a href="" ng-click="dnsCredentials.advancedVisible = false" ng-show="dnsCredentials.advancedVisible">Hide Advanced settings</a>
+                                    <a href="" ng-click="advancedVisible = true" ng-hide="advancedVisible">Advanced settings...</a>
+                                    <a href="" ng-click="advancedVisible = false" ng-show="advancedVisible">Hide Advanced settings</a>
                                 </div>
                             </div>
                         </div>
diff --git a/src/views/network.html b/src/views/network.html
index cf96a9052..8240d152d 100644
--- a/src/views/network.html
+++ b/src/views/network.html
@@ -9,7 +9,7 @@
         <form name="sysinfoForm" role="form" novalidate ng-submit="sysinfo.submit()" autocomplete="off">
           <fieldset>
             <div class="form-group">
-              <label class="control-label">Provider  <sup><a href="https://cloudron.io/documentation/domains/#sysinfo" class="help" target="_blank"><i class="fa fa-question-circle"></i></a></sup></label>
+              <label class="control-label">Provider  <sup><a href="https://cloudron.io/documentation/networking/#ip-configuration" class="help" target="_blank"><i class="fa fa-question-circle"></i></a></sup></label>
               <select class="form-control" ng-model="sysinfo.newProvider" ng-options="a.value as a.name for a in sysinfoProvider"></select>
             </div>