diff --git a/src/js/client.js b/src/js/client.js
index e673c76e7..ea6c4d996 100644
--- a/src/js/client.js
+++ b/src/js/client.js
@@ -898,8 +898,8 @@ angular.module('Application').service('Client', ['$http', '$interval', '$timeout
         });
     };
 
-    Client.prototype.getServerIp = function (callback) {
-        get('/api/v1/cloudron/server_ip', null, function (error, data, status) {
+    Client.prototype.getSysinfoConfig = function (callback) {
+        get('/api/v1/settings/sysinfo_config', null, function (error, data, status) {
             if (error) return callback(error);
             if (status !== 200) return callback(new ClientError(status, data));
 
@@ -907,8 +907,17 @@ angular.module('Application').service('Client', ['$http', '$interval', '$timeout
         });
     };
 
-    Client.prototype.getSysinfoConfig = function (callback) {
-        get('/api/v1/settings/sysinfo_config', null, function (error, data, status) {
+    Client.prototype.getServerIpv4 = function (callback) {
+        get('/api/v1/cloudron/server_ipv4', null, function (error, data, status) {
+            if (error) return callback(error);
+            if (status !== 200) return callback(new ClientError(status, data));
+
+            callback(null, data);
+        });
+    };
+
+    Client.prototype.getServerIpv6 = function (callback) {
+        get('/api/v1/cloudron/server_ipv6', null, function (error, data, status) {
             if (error) return callback(error);
             if (status !== 200) return callback(new ClientError(status, data));
 
@@ -952,8 +961,8 @@ angular.module('Application').service('Client', ['$http', '$interval', '$timeout
         });
     };
 
-    Client.prototype.setIPv6Config = function (enabled, callback) {
-        post('/api/v1/settings/ipv6', { enabled: enabled }, null, function (error, data, status) {
+    Client.prototype.setIPv6Config = function (config, callback) {
+        post('/api/v1/settings/ipv6', config, null, function (error, data, status) {
             if (error) return callback(error);
             if (status !== 200) return callback(new ClientError(status, data));
             callback(null);
@@ -965,7 +974,7 @@ angular.module('Application').service('Client', ['$http', '$interval', '$timeout
             if (error) return callback(error);
             if (status !== 200) return callback(new ClientError(status, data));
 
-            callback(null, data.enabled);
+            callback(null, data);
         });
     };
 
diff --git a/src/views/network.js b/src/views/network.js
index c096de408..0c060e4ed 100644
--- a/src/views/network.js
+++ b/src/views/network.js
@@ -126,7 +126,6 @@ angular.module('Application').controller('NetworkController', ['$scope', '$locat
         error: {},
 
         serverIPv4: '',
-        serverIPv6: '',
 
         provider: '',
         ipv4: '',
@@ -135,7 +134,6 @@ angular.module('Application').controller('NetworkController', ['$scope', '$locat
         // configure dialog
         newProvider: '',
         newIPv4: '',
-        newIPv6: '',
         newIfname: '',
 
         refresh: function () {
@@ -144,14 +142,12 @@ angular.module('Application').controller('NetworkController', ['$scope', '$locat
 
                 $scope.sysinfo.provider = result.provider;
                 $scope.sysinfo.ipv4 = result.ipv4 || '';
-                $scope.sysinfo.ipv6 = result.ipv6 || '';
                 $scope.sysinfo.ifname = result.ifname || '';
 
-                Client.getServerIp(function (error, result) {
+                Client.getServerIpv4(function (error, result) {
                     if (error) return console.error(error);
 
                     $scope.sysinfo.serverIPv4 = result.ipv4;
-                    $scope.sysinfo.serverIPv6 = result.ipv6 || '';
                 });
             });
         },
@@ -160,7 +156,6 @@ angular.module('Application').controller('NetworkController', ['$scope', '$locat
             $scope.sysinfo.error = {};
             $scope.sysinfo.newProvider = $scope.sysinfo.provider;
             $scope.sysinfo.newIPv4 = $scope.sysinfo.ipv4;
-            $scope.sysinfo.newIPv6 = $scope.sysinfo.ipv6;
             $scope.sysinfo.newIfname = $scope.sysinfo.ifname;
 
             $('#sysinfoModal').modal('show');
@@ -176,7 +171,6 @@ angular.module('Application').controller('NetworkController', ['$scope', '$locat
 
             if (config.provider === 'fixed') {
                 config.ipv4 = $scope.sysinfo.newIPv4;
-                if ($scope.ipv6Configure.isEnabled && $scope.sysinfo.newIPv6) config.ipv6 = $scope.sysinfo.newIPv6;
             } else if (config.provider === 'network-interface') {
                 config.ifname = $scope.sysinfo.newIfname;
             }
@@ -184,11 +178,7 @@ angular.module('Application').controller('NetworkController', ['$scope', '$locat
             Client.setSysinfoConfig(config, function (error) {
                 $scope.sysinfo.busy = false;
                 if (error && error.message.indexOf('ipv') !== -1) {
-                    if (error.message.indexOf('ipv4') !== -1) {
-                        $scope.sysinfo.error.ipv4 = error.message;
-                    } else {
-                        $scope.sysinfo.error.ipv6 = error.message;
-                    }
+                    $scope.sysinfo.error.ipv4 = error.message;
                     $scope.sysinfoForm.$setPristine();
                     $scope.sysinfoForm.$setUntouched();
                     return;