diff --git a/dashboard/src/js/restore.js b/dashboard/src/js/restore.js
index 56e69c0ff..046289921 100644
--- a/dashboard/src/js/restore.js
+++ b/dashboard/src/js/restore.js
@@ -55,13 +55,14 @@ app.controller('RestoreController', ['$scope', 'Client', function ($scope, Clien
         $scope.mountOptions.diskPath = '/dev/disk/by-uuid/' + newValue.uuid;
     });
 
-    $scope.sysinfo = {
+    $scope.ipv4Config = {
         provider: 'generic',
-        ipv4: '',
+        ip: '',
         ifname: ''
     };
 
-    $scope.sysinfoProvider = [
+    $scope.ipv4Providers = [
+        { name: 'Disabled', value: 'noop' },
         { name: 'Public IP', value: 'generic' },
         { name: 'Static IP Address', value: 'fixed' },
         { name: 'Network Interface', value: 'network-interface' }
@@ -224,16 +225,16 @@ app.controller('RestoreController', ['$scope', 'Client', function ($scope, Clien
             return;
         }
 
-        var sysinfoConfig = {
-            provider: $scope.sysinfo.provider
+        var ipv4Config = {
+            provider: $scope.ipv4Config.provider
         };
-        if ($scope.sysinfo.provider === 'fixed') {
-            sysinfoConfig.ip = $scope.sysinfo.ipv4;
-        } else if ($scope.sysinfo.provider === 'network-interface') {
-            sysinfoConfig.ifname = $scope.sysinfo.ifname;
+        if ($scope.ipv4Config.provider === 'fixed') {
+            ipv4Config.ip = $scope.ipv4Config.ip;
+        } else if ($scope.ipv4Config.provider === 'network-interface') {
+            ipv4Config.ifname = $scope.ipv4Config.ifname;
         }
 
-        Client.restore(backupConfig, $scope.remotePath.replace(/\.tar\.gz(\.enc)?$/, ''), version ? version[1] : '', sysinfoConfig, $scope.skipDnsSetup, $scope.setupToken, function (error) {
+        Client.restore(backupConfig, $scope.remotePath.replace(/\.tar\.gz(\.enc)?$/, ''), version ? version[1] : '', ipv4Config, $scope.skipDnsSetup, $scope.setupToken, function (error) {
             $scope.busy = false;
 
             if (error) {
diff --git a/dashboard/src/js/setupdns.js b/dashboard/src/js/setupdns.js
index 0c74bc0df..3e0b34ae8 100644
--- a/dashboard/src/js/setupdns.js
+++ b/dashboard/src/js/setupdns.js
@@ -26,13 +26,13 @@ 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 = {
+    $scope.ipv4Config = {
         provider: 'generic',
-        ipv4: '',
+        ip: '',
         ifname: ''
     };
 
-    $scope.sysinfoProvider = [
+    $scope.ipv4Providers = [
         { name: 'Disabled', value: 'noop' },
         { name: 'Public IP', value: 'generic' },
         { name: 'Static IP Address', value: 'fixed' },
@@ -223,13 +223,13 @@ app.controller('SetupDNSController', ['$scope', '$http', '$timeout', 'Client', f
             tlsConfig.wildcard = true;
         }
 
-        var sysinfoConfig = {
-            provider: $scope.sysinfo.provider
+        var ipv4Config = {
+            provider: $scope.ipv4Config.provider
         };
-        if ($scope.sysinfo.provider === 'fixed') {
-            sysinfoConfig.ip = $scope.sysinfo.ipv4;
-        } else if ($scope.sysinfo.provider === 'network-interface') {
-            sysinfoConfig.ifname = $scope.sysinfo.ifname;
+        if ($scope.ipv4Config.provider === 'fixed') {
+            ipv4Config.ip = $scope.ipv4Config.ip;
+        } else if ($scope.ipv4Config.provider === 'network-interface') {
+            ipv4Config.ifname = $scope.ipv4Config.ifname;
         }
 
         var data = {
@@ -240,7 +240,7 @@ app.controller('SetupDNSController', ['$scope', '$http', '$timeout', 'Client', f
                 config: config,
                 tlsConfig: tlsConfig
             },
-            ipv4Config: sysinfoConfig,
+            ipv4Config: ipv4Config,
             providerToken: $scope.instanceId,
             setupToken: $scope.setupToken
         };
diff --git a/dashboard/src/restore.html b/dashboard/src/restore.html
index 1f859131d..43cc05f6a 100644
--- a/dashboard/src/restore.html
+++ b/dashboard/src/restore.html
@@ -301,24 +301,22 @@
                                 <input class="ng-hide" type="submit" ng-disabled="configureBackupForm.$invalid"/>
 
                                 <div uib-collapse="!advancedVisible">
-
+                                    <!-- IPv4 provider -->
                                     <div class="form-group">
-                                        <label class="control-label">IP Configuration  <sup><a ng-href="https://docs.cloudron.io/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>
+                                        <label class="control-label">IPv4 Configuration  <sup><a ng-href="https://docs.cloudron.io/networking/#ip-configuration" class="help" target="_blank"><i class="fa fa-question-circle"></i></a></sup></label>
+                                        <select class="form-control" ng-model="ipv4Config.provider" ng-options="a.value as a.name for a in ipv4Providers"></select>
                                     </div>
 
-                                    <!-- Fixed -->
-                                    <div class="form-group" ng-show="sysinfo.provider === 'fixed'" ng-class="{ 'has-error': error.ipv4 }">
-                                        <label class="control-label">IP Address</label>
-                                        <input type="text" class="form-control" ng-model="sysinfo.ipv4" name="ipv4" ng-disabled="sysinfo.busy" ng-required="sysinfo.provider === 'fixed'">
-                                        <p class="has-error" ng-show="error.ipv4">{{ error.ipv4 }}</p>
+                                    <!-- IPv4 Fixed -->
+                                    <div class="form-group" ng-show="ipv4Config.provider === 'fixed'">
+                                        <label class="control-label">IPv4 Address</label>
+                                        <input type="text" class="form-control" ng-model="ipv4Config.ip" name="ipv4" ng-required="ipv4Config.provider === 'fixed'">
                                     </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>
+                                    <!-- IPv4 Network Interface -->
+                                    <div class="form-group" ng-show="ipv4Config.provider === 'network-interface'">
+                                        <label class="control-label">IPv4 Interface Name</label>
+                                        <input type="text" class="form-control" ng-model="ipv4Config.ifname" name="ifname" ng-required="ipv4Config.provider === 'network-interface'">
                                     </div>
                                 </div>
 
diff --git a/dashboard/src/setupdns.html b/dashboard/src/setupdns.html
index b80330182..4f96bc505 100644
--- a/dashboard/src/setupdns.html
+++ b/dashboard/src/setupdns.html
@@ -311,23 +311,22 @@
                                         <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>
 
+                                    <!-- IPv4 provider -->
                                     <div class="form-group">
-                                      <label class="control-label">IP Configuration  <sup><a ng-href="https://docs.cloudron.io/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>
+                                      <label class="control-label">IPv4 Configuration  <sup><a ng-href="https://docs.cloudron.io/networking/#ip-configuration" class="help" target="_blank"><i class="fa fa-question-circle"></i></a></sup></label>
+                                      <select class="form-control" ng-model="ipv4Config.provider" ng-options="a.value as a.name for a in ipv4Providers"></select>
                                     </div>
 
-                                    <!-- Fixed -->
-                                    <div class="form-group" ng-show="sysinfo.provider === 'fixed'" ng-class="{ 'has-error': error.ipv4 }">
-                                      <label class="control-label">IP Address</label>
-                                      <input type="text" class="form-control" ng-model="sysinfo.ipv4" name="ipv4" ng-disabled="sysinfo.busy" ng-required="sysinfo.provider === 'fixed'">
-                                      <p class="has-error" ng-show="error.ipv4">{{ error.ipv4 }}</p>
+                                    <!-- IPv4 Fixed -->
+                                    <div class="form-group" ng-show="ipv4Config.provider === 'fixed'">
+                                      <label class="control-label">IPv4 Address</label>
+                                      <input type="text" class="form-control" ng-model="ipv4Config.ip" name="ipv4" ng-required="ipv4Config.provider === 'fixed'">
                                     </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>
+                                    <!-- IPv4 Network Interface -->
+                                    <div class="form-group" ng-show="ipv4Config.provider === 'network-interface'">
+                                      <label class="control-label">IPv4 Interface Name</label>
+                                      <input type="text" class="form-control" ng-model="ipv4Config.ifname" name="ifname" ng-required="ipv4Config.provider === 'network-interface'">
                                     </div>
                                 </div>
                                 <div class="text-center">