diff --git a/app/views/admin/groups/show.html.haml b/app/views/admin/groups/show.html.haml
index 39ccca9d2b..12fc700d1e 100644
--- a/app/views/admin/groups/show.html.haml
+++ b/app/views/admin/groups/show.html.haml
@@ -87,7 +87,7 @@
 
         = form_tag project_teams_update_admin_group_path(@group), id: "new_team_member", class: "bulk_import", method: :put  do
           %div
-            = users_select_tag(:user_ids, { multiple: true, skip_ldap: true })
+            = users_select_tag(:user_ids, { multiple: true, skip_ldap: @group.ldap_cn.present? })
           %div.prepend-top-10
             = select_tag :group_access, options_for_select(UsersGroup.group_access_roles), class: "project-access-select select2"
           %hr
diff --git a/app/views/groups/_new_group_member.html.haml b/app/views/groups/_new_group_member.html.haml
index 14f982b2c5..9a8664a7e7 100644
--- a/app/views/groups/_new_group_member.html.haml
+++ b/app/views/groups/_new_group_member.html.haml
@@ -1,7 +1,7 @@
 = form_for @users_group, url: group_users_groups_path(@group), html: { class: 'form-horizontal users-group-form' } do |f|
   .form-group
     = f.label :user_ids, "People", class: 'control-label'
-    .col-sm-10= users_select_tag(:user_ids, { multiple: true, skip_ldap: true , class: 'input-large' })
+    .col-sm-10= users_select_tag(:user_ids, { multiple: true, skip_ldap: @group.ldap_cn.present? , class: 'input-large' })
 
   .form-group
     = f.label :group_access, "Group Access", class: 'control-label'
diff --git a/app/views/projects/team_members/_form.html.haml b/app/views/projects/team_members/_form.html.haml
index 5c16f4780d..1e4953b501 100644
--- a/app/views/projects/team_members/_form.html.haml
+++ b/app/views/projects/team_members/_form.html.haml
@@ -12,7 +12,7 @@
   .form-group
     = f.label :user_ids, "People", class: 'control-label'
     .col-sm-10
-      = users_select_tag(:user_ids, { multiple: true, skip_ldap: true })
+      = users_select_tag(:user_ids, { multiple: true, skip_ldap: @project.group.ldap_cn.present? })
 
   %p 2. Set access level for them
   .form-group