diff --git a/src/translation/de.json b/src/translation/de.json
index 4b08a9361..4bf4aeb30 100644
--- a/src/translation/de.json
+++ b/src/translation/de.json
@@ -76,7 +76,9 @@
             "daysAgo": "vor {{ d }} Tagen",
             "weeksAgo": "vor {{ w }} Wochen",
             "monthsAgo": "vor {{ m }} Monaten"
-        }
+        },
+        "disableAction": "Deaktivieren",
+        "enableAction": "Aktivieren"
     },
     "network": {
         "title": "Netzwerk",
diff --git a/src/translation/en.json b/src/translation/en.json
index d5df211a6..20a4afcce 100644
--- a/src/translation/en.json
+++ b/src/translation/en.json
@@ -739,7 +739,7 @@
             "address": "IPv4 Address"
         },
         "ipv6": {
-            "address": "IPv6 Address (optional)",
+            "address": "IPv6 Address",
             "title": "IPv6",
             "description": "Enable this option to configure DNS AAAA records for the apps and the mail server."
         }
diff --git a/src/translation/nl.json b/src/translation/nl.json
index 8ff679642..c00fe3687 100644
--- a/src/translation/nl.json
+++ b/src/translation/nl.json
@@ -365,6 +365,11 @@
         },
         "userImport": {
             "tooltip": "Importeer gebruikers"
+        },
+        "stateFilter": {
+            "all": "Alle gebruikers",
+            "active": "Actieve gebruikers",
+            "inactive": "Inactieve gebruikers"
         }
     },
     "profile": {
diff --git a/src/translation/ru.json b/src/translation/ru.json
index 67997ce82..aadfdf23b 100644
--- a/src/translation/ru.json
+++ b/src/translation/ru.json
@@ -365,6 +365,11 @@
         },
         "userImport": {
             "tooltip": "Импорт пользователей"
+        },
+        "stateFilter": {
+            "all": "Все пользователи",
+            "active": "Активные пользователи",
+            "inactive": "Бездействующие пользователи"
         }
     },
     "profile": {
diff --git a/src/views/network.html b/src/views/network.html
index 829f58e7f..8fbb3138d 100644
--- a/src/views/network.html
+++ b/src/views/network.html
@@ -23,9 +23,9 @@
               <input type="text" class="form-control" ng-model="sysinfo.newIPv4" name="ipv4" ng-disabled="sysinfo.busy" ng-required="sysinfo.newProvider === 'fixed'">
               <p class="has-error" ng-show="sysinfo.error.ipv4">{{ sysinfo.error.ipv4 }}</p>
             </div>
-            <div class="form-group" ng-show="sysinfo.newProvider === 'fixed'" ng-class="{ 'has-error': (!sysinfoForm.ipv4.$dirty && sysinfo.error.ipv6) }">
+            <div class="form-group" ng-show="sysinfo.newProvider === 'fixed' && ipv6Configure.isEnabled" ng-class="{ 'has-error': (!sysinfoForm.ipv4.$dirty && sysinfo.error.ipv6) }">
               <label class="control-label">{{ 'network.ipv6.address' | tr }}</label>
-              <input type="text" class="form-control" ng-model="sysinfo.newIPv6" name="ipv6" ng-disabled="sysinfo.busy">
+              <input type="text" class="form-control" ng-model="sysinfo.newIPv6" name="ipv6" ng-disabled="sysinfo.busy" ng-required="sysinfo.newProvider === 'fixed'&& ipv6Configure.isEnabled">
               <p class="has-error" ng-show="sysinfo.error.ipv6">{{ sysinfo.error.ipv6 }}</p>
             </div>
 
diff --git a/src/views/network.js b/src/views/network.js
index 8ddacfb3b..c096de408 100644
--- a/src/views/network.js
+++ b/src/views/network.js
@@ -176,7 +176,7 @@ angular.module('Application').controller('NetworkController', ['$scope', '$locat
 
             if (config.provider === 'fixed') {
                 config.ipv4 = $scope.sysinfo.newIPv4;
-                if ($scope.sysinfo.newIPv6) config.ipv6 = $scope.sysinfo.newIPv6;
+                if ($scope.ipv6Configure.isEnabled && $scope.sysinfo.newIPv6) config.ipv6 = $scope.sysinfo.newIPv6;
             } else if (config.provider === 'network-interface') {
                 config.ifname = $scope.sysinfo.newIfname;
             }