diff --git a/src/js/client.js b/src/js/client.js
index ff06219c6..b1d87cf99 100644
--- a/src/js/client.js
+++ b/src/js/client.js
@@ -2304,19 +2304,18 @@ angular.module('Application').service('Client', ['$http', '$interval', '$timeout
         });
     };
 
-    Client.prototype.updateDomain = function (domain, zoneName, provider, config, fallbackCertificate, tlsConfig, wellKnown, callback) {
+    Client.prototype.updateDomainConfig = function (domain, zoneName, provider, config, fallbackCertificate, tlsConfig, callback) {
         var data = {
             provider: provider,
             config: config,
-            tlsConfig: tlsConfig,
-            wellKnown: wellKnown
+            tlsConfig: tlsConfig
         };
         if (zoneName) data.zoneName = zoneName;
         var that = this;
 
         if (fallbackCertificate) data.fallbackCertificate = fallbackCertificate;
 
-        put('/api/v1/domains/' + domain, data, null, function (error, data, status) {
+        post('/api/v1/domains/' + domain + '/config', data, null, function (error, data, status) {
             if (error) return callback(error);
             if (status !== 204) return callback(new ClientError(status, data));
 
@@ -2324,6 +2323,20 @@ angular.module('Application').service('Client', ['$http', '$interval', '$timeout
         });
     };
 
+    Client.prototype.updateDomainWellKnown = function (domain, wellKnown, callback) {
+        var data = {
+            wellKnown: wellKnown
+        };
+        var that = this;
+
+        post('/api/v1/domains/' + domain + '/wellknown', data, null, function (error, data, status) {
+            if (error) return callback(error);
+            if (status !== 204) return callback(new ClientError(status, data));
+
+            callback(null);
+        });
+    };
+
     Client.prototype.renewCerts = function (callback) {
         post('/api/v1/cloudron/renew_certs', {}, null, function (error, data, status) {
             if (error) return callback(error);
diff --git a/src/translation/en.json b/src/translation/en.json
index 581e247b4..c74b1aa34 100644
--- a/src/translation/en.json
+++ b/src/translation/en.json
@@ -916,7 +916,8 @@
             "netcupCustomerNumber": "Customer Number",
             "netcupApiKey": "API Key",
             "netcupApiPassword": "API Password",
-            "vultrToken": "Vultr Token"
+            "vultrToken": "Vultr Token",
+            "wellKnownDescription": "The values will be used by Cloudron to respond to <code>/.well-known/</code> URLs. Note that an app must be available on the bare domain <code>{{ domain }}</code> for this to work."
         },
         "removeDialog": {
             "title": "Really remove {{ domain }}?",
@@ -928,7 +929,11 @@
             "description": "This will reprovision the app and email DNS records across all domains.",
             "syncAction": "Sync DNS",
             "showLogsAction": "Show Logs"
-        }
+        },
+        "domainWellKnown": {
+            "title": "Well-Known locations of {{ domain }}"
+        },
+        "tooltipWellKnown": "Set Well-Known Locations"
     },
     "notifications": {
         "title": "Notifications",
diff --git a/src/translation/ru.json b/src/translation/ru.json
index 1b04b0f67..d45a4b7cc 100644
--- a/src/translation/ru.json
+++ b/src/translation/ru.json
@@ -172,9 +172,10 @@
             "removeUserTooltip": "Удалить пользователя",
             "transferOwnershipTooltip": "Передать право владельца",
             "invitationTooltip": "Пригласить пользователя",
-            "setGhostTooltip": "Обезличить"
+            "setGhostTooltip": "Обезличить",
+            "mailmanagerTooltip": "Этот пользователь может управлять другими пользователями и почтовыми ящиками"
         },
-        "title": "Пользователи",
+        "title": "Пользователь",
         "newUserAction": "Новый пользователь",
         "groups": {
             "title": "Группы",
@@ -195,7 +196,7 @@
             "description": "Cloudron будет синхронизировать пользователей и группы с внешнего сервера LDAP или ActiveDirectory. Проверка пароля для аутентификации таких пользователей выполняется на внешнем сервере. Синхронизация не запускается автоматически, ее нужно активировать вручную.",
             "bindPassword": "Привязать пароль (необязательно)",
             "bindUsername": "Привязать Уникальное имя (DN)/Имя пользователя (необязательно)",
-            "title": "LDAP",
+            "title": "Подключиться удалённому каталогу",
             "subscriptionRequired": "Данная функция доступна только в платной подписке.",
             "subscriptionRequiredAction": "Настроить подписку сейчас",
             "noopInfo": "Не настроена LDAP аутентификация.",
@@ -328,6 +329,9 @@
         "invitationNotification": {
             "title": "Ссылка с приглашением отправлена",
             "body": "Письмо отправлено на {{ email }}"
+        },
+        "exposedLdap": {
+            "title": "Сервер каталога"
         }
     },
     "profile": {
diff --git a/src/views/domains.html b/src/views/domains.html
index 7dc6b7b40..dc149854e 100644
--- a/src/views/domains.html
+++ b/src/views/domains.html
@@ -156,16 +156,6 @@
 
           <a href="" ng-click="domainConfigure.advancedVisible = true" ng-hide="domainConfigure.advancedVisible">{{ 'domains.domainDialog.advancedAction' | tr }}</a>
           <div  uib-collapse="!domainConfigure.advancedVisible">
-            <div class="form-group">
-              <label class="control-label">{{ 'domains.domainDialog.matrixHostname' | tr }} <sup><a ng-href="https://docs.cloudron.io/domains/#matrix-server-location" class="help" target="_blank"><i class="fa fa-question-circle"></i></a></sup></label>
-              <input type="text" class="form-control" ng-model="domainConfigure.matrixHostname" name="matrixHostname" ng-disabled="domainConfigure.busy">
-            </div>
-
-            <div class="form-group">
-              <label class="control-label">{{ 'domains.domainDialog.mastodonHostname' | tr }} <sup><a ng-href="https://docs.cloudron.io/domains/#mastodon-server-location" class="help" target="_blank"><i class="fa fa-question-circle"></i></a></sup></label>
-              <input type="text" class="form-control" ng-model="domainConfigure.mastodonHostname" name="mastodonHostname" ng-disabled="domainConfigure.busy">
-            </div>
-
             <div class="form-group">
               <label class="control-label">{{ 'domains.domainDialog.zoneName' | tr }} <sup><a ng-href="https://docs.cloudron.io/domains/#zone-name" class="help" target="_blank"><i class="fa fa-question-circle"></i></a></sup></label>
               <input type="text" class="form-control" ng-model="domainConfigure.zoneName" name="zoneName" ng-disabled="domainConfigure.busy">
@@ -215,6 +205,40 @@
   </div>
 </div>
 
+<!-- modal domain wellknown -->
+<div class="modal fade" id="domainWellKnownModal" tabindex="-1" role="dialog">
+  <div class="modal-dialog">
+    <div class="modal-content">
+      <div class="modal-header">
+        <h4 class="modal-title">{{ 'domains.domainWellKnown.title' | tr:{ domain: domainWellKnown.domain.domain } }}</h4>
+      </div>
+      <div class="modal-body">
+        <p ng-bind-html="'domains.domainDialog.wellKnownDescription' | tr:{ domain: domainWellKnown.domain.domain }"></p>
+
+        <form name="domainWellKnownForm" role="form" novalidate ng-submit="domainWellKnown.submit()" autocomplete="off">
+          <p class="has-error text-center" ng-show="domainWellKnown.error">{{ domainWellKnown.error }}</p>
+
+          <div class="form-group">
+            <label class="control-label">{{ 'domains.domainDialog.matrixHostname' | tr }} <sup><a ng-href="https://docs.cloudron.io/domains/#matrix-server-location" class="help" target="_blank"><i class="fa fa-question-circle"></i></a></sup></label>
+            <input type="text" class="form-control" ng-model="domainWellKnown.matrixHostname" name="matrixHostname" ng-disabled="domainWellKnown.busy">
+          </div>
+
+          <div class="form-group">
+            <label class="control-label">{{ 'domains.domainDialog.mastodonHostname' | tr }} <sup><a ng-href="https://docs.cloudron.io/domains/#mastodon-server-location" class="help" target="_blank"><i class="fa fa-question-circle"></i></a></sup></label>
+            <input type="text" class="form-control" ng-model="domainWellKnown.mastodonHostname" name="mastodonHostname" ng-disabled="domainWellKnown.busy">
+          </div>
+
+          <input class="ng-hide" type="submit" ng-disabled="domainWellKnownForm.$invalid || domainWellKnown.busy"/>
+        </form>
+      </div>
+      <div class="modal-footer ">
+        <button type="button" class="btn btn-default" data-dismiss="modal">{{ 'main.dialog.cancel' | tr }}</button>
+        <button type="submit" class="btn btn-outline btn-success pull-right" ng-click="domainWellKnown.submit()" ng-disabled="domainWellKnownForm.$invalid || domainWellKnown.busy"><i class="fa fa-circle-notch fa-spin" ng-show="domainWellKnown.busy"></i> {{ 'main.dialog.save' | tr }}</button>
+      </div>
+    </div>
+  </div>
+</div>
+
 <!-- Modal domain remove -->
 <div class="modal fade" id="domainRemoveModal" tabindex="-1" role="dialog">
   <div class="modal-dialog">
@@ -265,6 +289,7 @@
                 {{ prettyProviderName(domain) }}
               </td>
               <td class="text-right no-wrap" style="vertical-align: bottom">
+                <button class="btn btn-xs btn-default" ng-click="domainWellKnown.show(domain)" title="{{ 'domains.tooltipWellKnown' | tr }}"><i class="fa fa-atlas"></i></button>
                 <button class="btn btn-xs btn-default" ng-click="domainConfigure.show(domain)" title="{{ 'domains.tooltipEdit' | tr }}"><i class="fa fa-pencil-alt"></i></button>
                 <button class="btn btn-xs btn-danger" ng-click="domainRemove.show(domain)" title="{{ 'domains.tooltipRemove' | tr }}" ng-disabled="domain.domain === config.adminDomain"><i class="far fa-trash-alt"></i></button>
               </td>
diff --git a/src/views/domains.js b/src/views/domains.js
index ef13832c2..704872c14 100644
--- a/src/views/domains.js
+++ b/src/views/domains.js
@@ -124,6 +124,77 @@ angular.module('Application').controller('DomainsController', ['$scope', '$locat
         }
     };
 
+    $scope.domainWellKnown = {
+        busy: false,
+        error: null,
+
+        domain: null,
+        mastodonHostname: '',
+        matrixHostname: '',
+
+        reset: function () {
+            $scope.domainWellKnown.busy = false;
+            $scope.domainWellKnown.error = null;
+            $scope.domainWellKnown.domain = null;
+
+            $scope.domainWellKnown.matrixHostname = '';
+            $scope.domainWellKnown.mastodonHostname = '';
+        },
+
+        show: function (domain) {
+            $scope.domainWellKnown.reset();
+
+            $scope.domainWellKnown.domain = domain;
+
+            try {
+                if (domain.wellKnown && domain.wellKnown['matrix/server']) {
+                    $scope.domainWellKnown.matrixHostname = JSON.parse(domain.wellKnown['matrix/server'])['m.server'];
+                }
+                if (domain.wellKnown && domain.wellKnown['host-meta']) {
+                    $scope.domainWellKnown.mastodonHostname = domain.wellKnown['host-meta'].match(new RegExp('template="https://(.*?)/'))[1];
+                }
+            } catch (e) {
+                console.error(e);
+            }
+
+            $('#domainWellKnownModal').modal('show');
+        },
+
+        submit: function () {
+            $scope.domainWellKnown.busy = true;
+            $scope.domainWellKnown.error = null;
+
+            var wellKnown = {};
+            if ($scope.domainWellKnown.matrixHostname) {
+                wellKnown['matrix/server'] = JSON.stringify({ 'm.server': $scope.domainWellKnown.matrixHostname });
+                // https://matrix.org/docs/spec/client_server/latest#get-well-known-matrix-client
+                wellKnown['matrix/client'] = JSON.stringify({
+                    'm.homeserver': {
+                        'base_url': 'https://' + $scope.domainWellKnown.matrixHostname
+                    }
+                });
+            }
+            if ($scope.domainWellKnown.mastodonHostname) {
+                wellKnown['host-meta'] = '<?xml version="1.0" encoding="UTF-8"?>\n'
+                    + '<XRD xmlns="http://docs.oasis-open.org/ns/xri/xrd-1.0">\n'
+                    + '<Link rel="lrdd" type="application/xrd+xml" template="https://' + $scope.domainWellKnown.mastodonHostname + '/.well-known/webfinger?resource={uri}"/>\n'
+                    + '</XRD>';
+            }
+
+            Client.updateDomainWellKnown($scope.domainWellKnown.domain.domain, wellKnown, function (error) {
+                $scope.domainWellKnown.busy = false;
+                if (error) {
+                    $scope.domainWellKnown.error = error.message;
+                    return;
+                }
+
+                $('#domainWellKnownModal').modal('hide');
+                $scope.domainWellKnown.reset();
+                refreshDomains();
+            });
+        }
+    };
+
     // We reused configure also for adding domains to avoid much code duplication
     $scope.domainConfigure = {
         adding: false,
@@ -156,9 +227,6 @@ angular.module('Application').controller('DomainsController', ['$scope', '$locat
         provider: 'route53',
         zoneName: '',
 
-        mastodonHostname: '',
-        matrixHostname: '',
-
         tlsConfig: {
             provider: 'letsencrypt-prod-wildcard'
         },
@@ -227,21 +295,6 @@ angular.module('Application').controller('DomainsController', ['$scope', '$locat
                     if (domain.tlsConfig.wildcard) $scope.domainConfigure.tlsConfig.provider += '-wildcard';
                 }
                 $scope.domainConfigure.zoneName = domain.zoneName;
-
-
-                $scope.domainConfigure.matrixHostname = '';
-                $scope.domainConfigure.mastodonHostname = '';
-
-                try {
-                    if (domain.wellKnown && domain.wellKnown['matrix/server']) {
-                        $scope.domainConfigure.matrixHostname = JSON.parse(domain.wellKnown['matrix/server'])['m.server'];
-                    }
-                    if (domain.wellKnown && domain.wellKnown['host-meta']) {
-                        $scope.domainConfigure.mastodonHostname = domain.wellKnown['host-meta'].match(new RegExp('template="https://(.*?)/'))[1];
-                    }
-                } catch (e) {
-                    console.error(e);
-                }
             } else {
                 $scope.domainConfigure.adding = true;
             }
@@ -321,27 +374,10 @@ angular.module('Application').controller('DomainsController', ['$scope', '$locat
                 tlsConfig.wildcard = true;
             }
 
-            var wellKnown = {};
-            if ($scope.domainConfigure.matrixHostname) {
-                wellKnown['matrix/server'] = JSON.stringify({ 'm.server': $scope.domainConfigure.matrixHostname });
-                // https://matrix.org/docs/spec/client_server/latest#get-well-known-matrix-client
-                wellKnown['matrix/client'] = JSON.stringify({
-                    'm.homeserver': {
-                        'base_url': 'https://' + $scope.domainConfigure.matrixHostname
-                    }
-                });
-            }
-            if ($scope.domainConfigure.mastodonHostname) {
-                wellKnown['host-meta'] = '<?xml version="1.0" encoding="UTF-8"?>\n'
-                    + '<XRD xmlns="http://docs.oasis-open.org/ns/xri/xrd-1.0">\n'
-                    + '<Link rel="lrdd" type="application/xrd+xml" template="https://' + $scope.domainConfigure.mastodonHostname + '/.well-known/webfinger?resource={uri}"/>\n'
-                    + '</XRD>';
-            }
-
             // choose the right api, since we reuse this for adding and configuring domains
             var func;
-            if ($scope.domainConfigure.adding) func = Client.addDomain.bind(Client, $scope.domainConfigure.newDomain, $scope.domainConfigure.zoneName, provider, data, fallbackCertificate, tlsConfig, wellKnown);
-            else func = Client.updateDomain.bind(Client, $scope.domainConfigure.domain.domain, $scope.domainConfigure.zoneName, provider, data, fallbackCertificate, tlsConfig, wellKnown);
+            if ($scope.domainConfigure.adding) func = Client.addDomain.bind(Client, $scope.domainConfigure.newDomain, $scope.domainConfigure.zoneName, provider, data, fallbackCertificate, tlsConfig);
+            else func = Client.updateDomainConfig.bind(Client, $scope.domainConfigure.domain.domain, $scope.domainConfigure.zoneName, provider, data, fallbackCertificate, tlsConfig);
 
             func(function (error) {
                 $scope.domainConfigure.busy = false;
@@ -653,7 +689,7 @@ angular.module('Application').controller('DomainsController', ['$scope', '$locat
     // setup all the dialog focus handling
     ['domainConfigureModal', 'domainRemoveModal'].forEach(function (id) {
         $('#' + id).on('shown.bs.modal', function () {
-            $(this).find("[autofocus]:first").focus();
+            $(this).find('[autofocus]:first').focus();
         });
     });