diff --git a/src/views/network.html b/src/views/network.html
index 52dab6a02..588fadb36 100644
--- a/src/views/network.html
+++ b/src/views/network.html
@@ -152,7 +152,6 @@
     <div class="row">
       <div class="col-md-12">
         <p>{{ 'network.ipv6.description' | tr }}</p>
-        <p class="text-danger" ng-show="ipv6Configure.error"><br/>{{ ipv6Configure.error }}</p>
         <div class="checkbox">
           <label>
             <input type="checkbox" ng-model="ipv6Configure.enabled" name="ipv6" ng-disabled="ipv6Configure.busy"/>&nbsp; {{ 'network.ipv6.enable' | tr }}
@@ -164,6 +163,7 @@
     <div class="row">
       <div class="col-md-6">
         <span class="text-success text-bold" ng-show="ipv6Configure.success">{{ 'network.ipv6.saved' | tr }}</span>
+        <span class="text-danger" ng-show="ipv6Configure.error">{{ ipv6Configure.error }}</span>
       </div>
 
       <div class="col-md-6 text-right">
diff --git a/src/views/network.js b/src/views/network.js
index e93fd7575..2c8531868 100644
--- a/src/views/network.js
+++ b/src/views/network.js
@@ -78,10 +78,14 @@ angular.module('Application').controller('NetworkController', ['$scope', '$locat
             $scope.ipv6Configure.error = '';
 
             Client.setIPv6Config($scope.ipv6Configure.enabled, function (error) {
-                if (error) $scope.ipv6Configure.error = error.message;
-                else $scope.ipv6Configure.currentState = $scope.ipv6Configure.enabled;
-
                 $scope.ipv6Configure.busy = false;
+
+                if (error) {
+                    $scope.ipv6Configure.error = error.message;
+                    $scope.ipv6Configure.enabled = !$scope.ipv6Configure.enabled; // restore old state
+                    return;
+                }
+                $scope.ipv6Configure.currentState = $scope.ipv6Configure.enabled;
                 $scope.ipv6Configure.success = true;
             });
         }