diff --git a/src/views/network.html b/src/views/network.html
index 069819e69..32efcb09d 100644
--- a/src/views/network.html
+++ b/src/views/network.html
@@ -152,17 +152,14 @@
     <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>
     </div>
 
     <div class="row">
-      <div class="col-md-6">
-        <span class="text-danger" ng-show="ipv6Configure.error">{{ ipv6Configure.error }}</span>
-      </div>
-
-      <div class="col-md-6 text-right">
-        <button class="btn btn-outline btn-primary pull-right" ng-hide="ipv6Configure.isEnabled" ng-click="ipv6Configure.setEnabled(true)" ng-disabled="ipv6Configure.busy"><i class="fa fa-circle-notch fa-spin" ng-show="ipv6Configure.busy"></i>  {{ 'main.enableAction' | tr }}</button>
-        <button class="btn btn-outline btn-danger pull-right" ng-show="ipv6Configure.isEnabled" ng-click="ipv6Configure.setEnabled(false)" ng-disabled="ipv6Configure.busy"><i class="fa fa-circle-notch fa-spin" ng-show="ipv6Configure.busy"></i>  {{ 'main.disableAction' | tr }}</button>
+      <div class="col-md-12 text-right">
+        <button class="btn btn-outline btn-primary" ng-hide="ipv6Configure.isEnabled" ng-click="ipv6Configure.setEnabled(true)" ng-disabled="ipv6Configure.busy"><i class="fa fa-circle-notch fa-spin" ng-show="ipv6Configure.busy"></i>  {{ 'main.enableAction' | tr }}</button>
+        <button class="btn btn-outline btn-danger" ng-show="ipv6Configure.isEnabled" ng-click="ipv6Configure.setEnabled(false)" ng-disabled="ipv6Configure.busy"><i class="fa fa-circle-notch fa-spin" ng-show="ipv6Configure.busy"></i>  {{ 'main.disableAction' | tr }}</button>
       </div>
     </div>
   </div>
@@ -176,21 +173,13 @@
       <div class="col-md-12">
         <p>{{ 'network.dyndns.description' | tr }}</p>
         <p class="text-danger" ng-show="dyndnsConfigure.error"><br/>{{ dyndnsConfigure.error }}</p>
-        <div class="checkbox">
-          <label>
-            <input type="checkbox" ng-model="dyndnsConfigure.enabled" name="dynamicDns" ng-disabled="dyndnsConfigure.busy"/>&nbsp; {{ 'network.dyndns.useLabel' | tr }}
-          </label>
-        </div>
       </div>
     </div>
 
     <div class="row">
-      <div class="col-md-6">
-        <span class="text-success text-bold" ng-show="dyndnsConfigure.success">{{ 'network.dyndns.saved' | tr }}</span>
-      </div>
-
-      <div class="col-md-6 text-right">
-        <button class="btn btn-outline btn-primary pull-right" ng-click="dyndnsConfigure.submit()" ng-disabled="dyndnsConfigure.currentState === dyndnsConfigure.enabled"><i class="fa fa-circle-notch fa-spin" ng-show="dyndnsConfigure.busy"></i>  {{ 'main.dialog.save' | tr }}</button>
+      <div class="col-md-12 text-right">
+        <button class="btn btn-outline btn-primary" ng-hide="dyndnsConfigure.isEnabled" ng-click="dyndnsConfigure.setEnabled(true)" ng-disabled="dyndnsConfigure.busy"><i class="fa fa-circle-notch fa-spin" ng-show="dyndnsConfigure.busy"></i>  {{ 'main.enableAction' | tr }}</button>
+        <button class="btn btn-outline btn-danger" ng-show="dyndnsConfigure.isEnabled" ng-click="dyndnsConfigure.setEnabled(false)" ng-disabled="dyndnsConfigure.busy"><i class="fa fa-circle-notch fa-spin" ng-show="dyndnsConfigure.busy"></i>  {{ 'main.disableAction' | tr }}</button>
       </div>
     </div>
   </div>
diff --git a/src/views/network.js b/src/views/network.js
index cd4e5f6a6..2f79d9d30 100644
--- a/src/views/network.js
+++ b/src/views/network.js
@@ -27,31 +27,26 @@ angular.module('Application').controller('NetworkController', ['$scope', '$locat
 
     $scope.dyndnsConfigure = {
         busy: false,
-        success: false,
         error: '',
-        currentState: false,
-        enabled: false,
+        isEnabled: false,
 
         refresh: function () {
             Client.getDynamicDnsConfig(function (error, enabled) {
                 if (error) return console.error(error);
 
-                $scope.dyndnsConfigure.currentState = enabled;
-                $scope.dyndnsConfigure.enabled = enabled;
+                $scope.dyndnsConfigure.isEnabled = enabled;
             });
         },
 
-        submit: function () {
+        setEnabled: function (enabled) {
             $scope.dyndnsConfigure.busy = true;
-            $scope.dyndnsConfigure.success = false;
             $scope.dyndnsConfigure.error = '';
 
-            Client.setDynamicDnsConfig($scope.dyndnsConfigure.enabled, function (error) {
-                if (error) $scope.dyndnsConfigure.error = error.message;
-                else $scope.dyndnsConfigure.currentState = $scope.dyndnsConfigure.enabled;
-
+            Client.setDynamicDnsConfig(enabled, function (error) {
                 $scope.dyndnsConfigure.busy = false;
-                $scope.dyndnsConfigure.success = true;
+
+                if (error) $scope.dyndnsConfigure.error = error.message;
+                else $scope.dyndnsConfigure.isEnabled = enabled;
             });
         }
     };
@@ -76,12 +71,8 @@ angular.module('Application').controller('NetworkController', ['$scope', '$locat
             Client.setIPv6Config(enabled, function (error) {
                 $scope.ipv6Configure.busy = false;
 
-                if (error) {
-                    $scope.ipv6Configure.error = error.message;
-                    return;
-                }
-
-                $scope.ipv6Configure.isEnabled = enabled;
+                if (error) $scope.ipv6Configure.error = error.message;
+                else $scope.ipv6Configure.isEnabled = enabled;
             });
         }
     };