diff --git a/src/views/users.html b/src/views/users.html
index dffe61a35..0c7436cbb 100644
--- a/src/views/users.html
+++ b/src/views/users.html
@@ -268,6 +268,68 @@
     </div>
 </div>
 
+<!-- Modal external ldap -->
+<div class="modal fade" id="externalLdapModal" tabindex="-1" role="dialog">
+  <div class="modal-dialog">
+    <div class="modal-content">
+      <div class="modal-header">
+        <h4 class="modal-title">Configure external LDAP</h4>
+      </div>
+      <div class="modal-body">
+        <div class="checkbox">
+          <label>
+            <input type="checkbox" ng-model="externalLdap.enabled">Enable</input>
+          </label>
+        </div>
+
+        <br/>
+
+        <div  uib-collapse="!externalLdap.enabled">
+          <form name="externalLdapConfigForm" role="form" novalidate ng-submit="externalLdap.submit()" autocomplete="off">
+            <fieldset>
+              <p class="has-error text-center" ng-show="externalLdap.error.generic">{{ externalLdap.error.generic }}</p>
+
+              <!-- avoid browsers to attempt an autofill for bindDN/bindPassword -->
+              <input type="password" style="display: none;">
+
+              <div class="form-group" ng-class="{ 'has-error': externalLdap.error.url }">
+                <label class="control-label" for="inputExternalLdapConfigUrl">Endpoint Url</label>
+                <input type="text" class="form-control" ng-model="externalLdap.url" id="inputExternalLdapConfigUrl" name="url" ng-disabled="externalLdap.busy" placeholder="ldaps://example.com:636" required>
+              </div>
+
+              <div class="form-group" ng-class="{ 'has-error': externalLdap.error.baseDn }">
+                <label class="control-label" for="inputExternalLdapConfigBaseDn">Base DN</label>
+                <input type="text" class="form-control" ng-model="externalLdap.baseDn" id="inputExternalLdapConfigBaseDn" name="baseDn" ng-disabled="externalLdap.busy" placeholder="ou=Users,dc=example,dc=com" required>
+              </div>
+
+              <div class="form-group" ng-class="{ 'has-error': externalLdap.error.filter }">
+                <label class="control-label" for="inputExternalLdapConfigFilter">Filter</label>
+                <input type="text" class="form-control" ng-model="externalLdap.filter" id="inputExternalLdapConfigFilter" name="filter" ng-disabled="externalLdap.busy" placeholder="(objectClass=inetOrgPerson)" required>
+              </div>
+
+              <div class="form-group" ng-class="{ 'has-error': externalLdap.error.credentials }">
+                <label class="control-label" for="inputExternalLdapConfigBindDn">Bind DN (optional)</label>
+                <input type="text" class="form-control" ng-model="externalLdap.bindDn" id="inputExternalLdapConfigBindDn" name="bindDn" ng-disabled="externalLdap.busy" placeholder="uid=admin,ou=Users,dc=example,dc=com">
+              </div>
+
+              <div class="form-group" ng-class="{ 'has-error': externalLdap.error.credentials }">
+                <label class="control-label" for="inputExternalLdapConfigBindPassword">Bind Password (optional)</label>
+                <input type="password" class="form-control" ng-model="externalLdap.bindPassword" id="inputExternalLdapConfigBindPassword" name="bindPassword" ng-disabled="externalLdap.busy" placeholder="">
+              </div>
+
+              <input class="ng-hide" type="submit" ng-disabled="externalLdapConfigForm.$invalid"/>
+            </fieldset>
+          </form>
+        </div>
+      </div>
+      <div class="modal-footer">
+        <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
+        <button type="button" class="btn btn-primary" ng-click="externalLdap.submit()" ng-disabled="externalLdapConfigForm.$invalid || externalLdap.busy"><i class="fa fa-circle-notch fa-spin" ng-show="externalLdap.busy"></i> Save</button>
+      </div>
+    </div>
+  </div>
+</div>
+
 <div class="content content-large">
 
   <div class="text-left">
@@ -402,63 +464,18 @@
       <div class="col-md-12">
         <p>
           This option allows to use an external LDAP or ActiveDirectory service for user management.
-          <button class="btn btn-primary pull-right" ng-show="externalLdap.enabled" ng-click="externalLdap.sync()"><i class="fa fa-circle-notch fa-spin" ng-show="externalLdap.syncBusy"></i> Synchronize users</button>
         </p>
 
-        <div class="checkbox">
-          <label>
-            <input type="checkbox" ng-model="externalLdap.enabled">Enable external LDAP</input>
-          </label>
-        </div>
-
-        <div  uib-collapse="!externalLdap.enabled">
-          <form name="externalLdapConfigForm" role="form" novalidate ng-submit="externalLdap.submit()" autocomplete="off">
-            <fieldset>
-              <p class="has-error text-center" ng-show="externalLdap.error.generic">{{ externalLdap.error.generic }}</p>
-
-              <!-- avoid browsers to attempt an autofill for bindDN/bindPassword -->
-              <input type="password" style="display: none;">
-
-              <div class="form-group" ng-class="{ 'has-error': externalLdap.error.url }">
-                <label class="control-label" for="inputExternalLdapConfigUrl">Endpoint Url</label>
-                <input type="text" class="form-control" ng-model="externalLdap.url" id="inputExternalLdapConfigUrl" name="url" ng-disabled="externalLdap.busy" placeholder="ldaps://example.com:636" required>
-              </div>
-
-              <div class="form-group" ng-class="{ 'has-error': externalLdap.error.baseDn }">
-                <label class="control-label" for="inputExternalLdapConfigBaseDn">Base DN</label>
-                <input type="text" class="form-control" ng-model="externalLdap.baseDn" id="inputExternalLdapConfigBaseDn" name="baseDn" ng-disabled="externalLdap.busy" placeholder="ou=Users,dc=example,dc=com" required>
-              </div>
-
-              <div class="form-group" ng-class="{ 'has-error': externalLdap.error.filter }">
-                <label class="control-label" for="inputExternalLdapConfigFilter">Filter</label>
-                <input type="text" class="form-control" ng-model="externalLdap.filter" id="inputExternalLdapConfigFilter" name="filter" ng-disabled="externalLdap.busy" placeholder="(objectClass=inetOrgPerson)" required>
-              </div>
-
-              <div class="form-group" ng-class="{ 'has-error': externalLdap.error.credentials }">
-                <label class="control-label" for="inputExternalLdapConfigBindDn">Bind DN (optional)</label>
-                <input type="text" class="form-control" ng-model="externalLdap.bindDn" id="inputExternalLdapConfigBindDn" name="bindDn" ng-disabled="externalLdap.busy" placeholder="uid=admin,ou=Users,dc=example,dc=com">
-              </div>
-
-              <div class="form-group" ng-class="{ 'has-error': externalLdap.error.credentials }">
-                <label class="control-label" for="inputExternalLdapConfigBindPassword">Bind Password (optional)</label>
-                <input type="password" class="form-control" ng-model="externalLdap.bindPassword" id="inputExternalLdapConfigBindPassword" name="bindPassword" ng-disabled="externalLdap.busy" placeholder="">
-              </div>
-
-              <input class="ng-hide" type="submit" ng-disabled="externalLdapConfigForm.$invalid"/>
-            </fieldset>
-          </form>
-        </div>
-
+        <button class="btn btn-success" ng-show="externalLdap.enabled" ng-click="externalLdap.sync()"><i class="fa fa-circle-notch fa-spin" ng-show="externalLdap.syncBusy"></i> Synchronize</button>
+        <a class="btn btn-primary" ng-show="externalLdap.taskId" ng-href="/logs.html?taskId={{ externalLdap.taskId }}" target="_blank">Show Logs</a>
+        <button class="btn btn-primary pull-right" ng-click="externalLdap.show()">Configure</button>
       </div>
     </div>
 
     <div class="row">
       <div class="col-md-6">
-        <span class="text-success text-bold" ng-show="externalLdap.success">Saved</span>
       </div>
-
-      <div class="col-md-6 text-right">
-        <button class="btn btn-outline btn-primary pull-right" ng-click="externalLdap.submit()" ng-disabled="externalLdapConfigForm.$invalid || externalLdap.busy"><i class="fa fa-circle-notch fa-spin" ng-show="externalLdap.busy"></i>  Save</button>
+      <div class="col-md-6">
       </div>
     </div>
   </div>
diff --git a/src/views/users.js b/src/views/users.js
index ec6d794ef..59e0dfd86 100644
--- a/src/views/users.js
+++ b/src/views/users.js
@@ -416,8 +416,8 @@ angular.module('Application').controller('UsersController', ['$scope', '$locatio
     $scope.externalLdap = {
         busy: false,
         error: {},
-        success: false,
         syncBusy: false,
+        taskId: 0,
 
         // fields
         enabled: false,
@@ -437,6 +437,8 @@ angular.module('Application').controller('UsersController', ['$scope', '$locatio
                     return;
                 }
 
+                $scope.externalLdap.taskId = taskId;
+
                 function refreshTaskStatus() {
                     Client.getTask(taskId, function (error, result) {
                         if (error) console.error(error);
@@ -450,10 +452,16 @@ angular.module('Application').controller('UsersController', ['$scope', '$locatio
             });
         },
 
+        show: function () {
+            $scope.externalLdap.busy = false;
+            $scope.externalLdap.error = {};
+
+            $('#externalLdapModal').modal('show');
+        },
+
         submit: function () {
             $scope.externalLdap.busy = true;
             $scope.externalLdap.error = {};
-            $scope.externalLdap.success = false;
 
             var config = {
                 enabled: $scope.externalLdap.enabled,
@@ -484,7 +492,7 @@ angular.module('Application').controller('UsersController', ['$scope', '$locatio
                         $scope.externalLdap.error.generic = error.message;
                     }
                 } else {
-                    $scope.externalLdap.success = true;
+                    $('#externalLdapModal').modal('hide');
                 }
             });
         }
@@ -575,6 +583,14 @@ angular.module('Application').controller('UsersController', ['$scope', '$locatio
             $scope.externalLdap.filter = result.filter;
             $scope.externalLdap.bindDn = result.bindDn;
             $scope.externalLdap.bindPassword = result.bindPassword;
+
+            Client.getLatestTaskByType('syncExternalLdap', function (error, task) {
+                if (error) return console.error(error);
+
+                if (!task) return;
+
+                $scope.externalLdap.taskId = task.id;
+            });
         });
     }