diff --git a/src/js/setupaccount.js b/src/js/setupaccount.js
index 9574b00c4..eff80f598 100644
--- a/src/js/setupaccount.js
+++ b/src/js/setupaccount.js
@@ -38,24 +38,24 @@ app.config(['$translateProvider', function ($translateProvider) {
 // If we find out how to get that function handle somehow dynamically we can use that, otherwise the copy is required
 function translateFilterFactory($parse, $translate) {
 
-  'use strict';
+    'use strict';
 
-  var translateFilter = function (translationId, interpolateParams, interpolation, forceLanguage) {
-    if (!angular.isObject(interpolateParams)) {
-      var ctx = this || {
-        '__SCOPE_IS_NOT_AVAILABLE': 'More info at https://github.com/angular/angular.js/commit/8863b9d04c722b278fa93c5d66ad1e578ad6eb1f'
-        };
-      interpolateParams = $parse(interpolateParams)(ctx);
+    var translateFilter = function (translationId, interpolateParams, interpolation, forceLanguage) {
+        if (!angular.isObject(interpolateParams)) {
+            var ctx = this || {
+                '__SCOPE_IS_NOT_AVAILABLE': 'More info at https://github.com/angular/angular.js/commit/8863b9d04c722b278fa93c5d66ad1e578ad6eb1f'
+            };
+            interpolateParams = $parse(interpolateParams)(ctx);
+        }
+
+        return $translate.instant(translationId, interpolateParams, interpolation, forceLanguage);
+    };
+
+    if ($translate.statefulFilter()) {
+        translateFilter.$stateful = true;
     }
 
-    return $translate.instant(translationId, interpolateParams, interpolation, forceLanguage);
-  };
-
-  if ($translate.statefulFilter()) {
-    translateFilter.$stateful = true;
-  }
-
-  return translateFilter;
+    return translateFilter;
 }
 translateFilterFactory.displayName = 'translateFilterFactory';
 app.filter('tr', translateFilterFactory);
@@ -89,7 +89,7 @@ app.controller('SetupAccountController', ['$scope', '$translate', '$http', funct
         };
 
         if (!$scope.profileLocked) {
-            data.username = $scope.username;
+            if (!$scope.existingUsername) data.username = $scope.username;
             data.displayName = $scope.displayName;
         }
 
@@ -129,15 +129,20 @@ app.controller('SetupAccountController', ['$scope', '$translate', '$http', funct
         }).error(error);
     };
 
-    $http.get(API_ORIGIN + '/api/v1/cloudron/status').success(function (data, status) {
+    if (!$scope.existingUsername && $scope.profileLocked) {
+        $scope.view = 'noUsername';
         $scope.initialized = true;
+    } else {
+        $http.get(API_ORIGIN + '/api/v1/cloudron/status').success(function (data, status) {
+            $scope.initialized = true;
 
-        if (status !== 200) return;
+            if (status !== 200) return;
 
-        if (data.language) $translate.use(data.language);
+            if (data.language) $translate.use(data.language);
 
-        $scope.status = data;
-    }).error(function () {
-        $scope.initialized = false;
-    });
+            $scope.status = data;
+        }).error(function () {
+            $scope.initialized = false;
+        });
+    }
 }]);
diff --git a/src/setupaccount.html b/src/setupaccount.html
index b006ca2a0..95edcd785 100644
--- a/src/setupaccount.html
+++ b/src/setupaccount.html
@@ -110,6 +110,20 @@
     </div>
   </div>
 
+  <div class="layout-content" ng-show="view === 'noUsername'">
+    <div class="card" style="padding: 20px; margin-top: 100px; max-width: 620px;">
+      <div class="row">
+        <div class="col-md-12" style="text-align: center;">
+          <img width="128" height="128" style="margin-top: -84px" src="<%= apiOrigin %>/api/v1/cloudron/avatar"/>
+          <br/>
+          <h2>{{ 'setupAccount.noUsername.title' | tr }}</h2>
+          <br/>
+          <p>{{ 'setupAccount.noUsername.description' | tr }}</p>
+        </div>
+      </div>
+    </div>
+  </div>
+
   <div class="layout-content" ng-show="view === 'invalidToken'">
     <div class="card" style="padding: 20px; margin-top: 100px; max-width: 620px;">
       <div class="row">
diff --git a/src/translation/en.json b/src/translation/en.json
index 52953eaf6..4da7dd962 100644
--- a/src/translation/en.json
+++ b/src/translation/en.json
@@ -1610,6 +1610,10 @@
         "success": {
             "title": "Your Account is ready",
             "openDashboardAction": "Open Dashboard"
+        },
+        "noUsername": {
+            "title": "Cannot setup account",
+            "description": "Account cannot be setup without a username."
         }
     },
     "welcomeEmail": {
diff --git a/src/translation/nl.json b/src/translation/nl.json
index 4f7bc372a..b4b9278a1 100644
--- a/src/translation/nl.json
+++ b/src/translation/nl.json
@@ -343,7 +343,11 @@
             },
             "enabled": "Ingeschakeld",
             "title": "Lijst server",
-            "description": "Cloudron kan ingezet worden als gebruikerslijstserver voor externe applicaties."
+            "description": "Cloudron kan ingezet worden als gebruikerslijstserver voor externe applicaties.",
+            "secret": {
+                "label": "Geheim",
+                "description": "Alle LDAP verzoeken moeten geauthentiseerd worden met dit geheim en de gebruiker DN <i>{{ userDN }}</i>"
+            }
         }
     },
     "profile": {
@@ -552,7 +556,8 @@
             "port": "Poort",
             "diskPath": "Schijf pad",
             "user": "Gebruiker",
-            "privateKey": "Private sleutel"
+            "privateKey": "Private sleutel",
+            "cifsSealSupport": "Gebruik seal encryptie. SMB v3 is hiervoor minimaal benodigd"
         },
         "backupFailed": {
             "title": "Backup maken niet mogelijk"
@@ -1070,7 +1075,8 @@
             "configure": "Configureer",
             "interfaceDescription": "Toon beschikbare apparaten op deze server met:",
             "description": "Cloudron gebruikt dit IP adres tijdens het instellen van DNS records.",
-            "detected": "gedetecteerd"
+            "detected": "gedetecteerd",
+            "address": "IP adres"
         },
         "firewall": {
             "title": "Firewall",
@@ -1091,6 +1097,16 @@
         "configureIp": {
             "title": "Configureer IP aanbieder",
             "providerGenericDescription": "Het publieke IP adres van deze server wordt automatisch gedetecteerd."
+        },
+        "ipv4": {
+            "address": "IPv4 adres"
+        },
+        "ipv6": {
+            "address": "IPv6 adres (optioneel)",
+            "title": "IPv6",
+            "description": "Schakel deze optie in om DNS AAAA records te configureren voor apps en mailserver.",
+            "enable": "Inschakelen IPv6",
+            "saved": "Opgeslagen"
         }
     },
     "services": {
diff --git a/src/translation/ru.json b/src/translation/ru.json
index b9869dd42..ee71ca4df 100644
--- a/src/translation/ru.json
+++ b/src/translation/ru.json
@@ -840,7 +840,8 @@
             "uploadPartSizeDescription": "Размер одной части копии, состоящей из нескольких частей. До 3-х частей загружаются параллельно и требуют больше выделенной памяти.",
             "copyConcurrencyDescription": "Количество удаленных копий файлов, выгружаемых одновременно во время резервного копирования.",
             "password": "Пароль",
-            "setupMountDescription": "Если опция включена, Cloudron настроит точку монтирования на сервере"
+            "setupMountDescription": "Если опция включена, Cloudron настроит точку монтирования на сервере",
+            "cifsSealSupport": "Использовать SEAL шифрование. Требуется SMB v3"
         },
         "title": "Резервные копии",
         "logs": {
diff --git a/src/views/users.html b/src/views/users.html
index df2cdcc75..ebaecd23e 100644
--- a/src/views/users.html
+++ b/src/views/users.html
@@ -75,7 +75,7 @@
 
           <div class="form-group" ng-class="{ 'has-error': (useradd_form.username.$dirty && useradd_form.username.$invalid) || (!useradd_form.username.$dirty && useradd.error.username) }">
             <label class="control-label">{{ 'users.user.username' | tr }}</label>
-            <input type="text" class="form-control" ng-model="useradd.username" name="username" id="inputUserAddUsername" placeholder="{{ 'users.user.usernamePlaceholder' | tr }}">
+            <input type="text" class="form-control" ng-model="useradd.username" name="username" id="inputUserAddUsername" ng-required="config.profileLocked" placeholder="{{ config.profileLocked ? '' : ('users.user.usernamePlaceholder' | tr) }}">
             <div class="control-label" ng-show="(!useradd_form.username.$dirty && useradd.error.username) || (useradd_form.username.$dirty && useradd_form.username.$invalid) || (!useradd_form.username.$dirty && useradd.error.username)">
               <small ng-show="useradd_form.username.$error.username">{{ 'users.user.errorInvalidUsername' | tr }}</small>
               <small ng-show="!useradd_form.username.$dirty && useradd.error.username">{{ useradd.error.username }}</small>
diff --git a/src/views/users.js b/src/views/users.js
index 671dc5933..e9af54d9a 100644
--- a/src/views/users.js
+++ b/src/views/users.js
@@ -787,6 +787,8 @@ angular.module('Application').controller('UsersController', ['$scope', '$locatio
                 $scope.profileConfigForm.$setUntouched();
                 $scope.profileConfigForm.$setPristine();
 
+                Client.refreshConfig(); // refresh the $scope.config
+
                 $timeout(function () {
                     $scope.profileConfig.busy = false;
                 }, 3000);