diff --git a/app/views/admin/groups/_form.html.haml b/app/views/admin/groups/_form.html.haml
index 7bf2648f07..56d52a3ec0 100644
--- a/app/views/admin/groups/_form.html.haml
+++ b/app/views/admin/groups/_form.html.haml
@@ -57,46 +57,4 @@
       = link_to  'Cancel', admin_group_path(@group), class: "btn btn-cancel"
 
 - if @group.persisted?
-  %section.ldap-group-links
-    %fieldset
-      %legend Current LDAP links
-      - if @group.ldap_group_links.any?
-        %ul.bordered-list
-          - @group.ldap_group_links.each do |ldap_group_link|
-            %li
-              %h4
-                = ldap_group_link.cn
-                %small.light== as #{ldap_group_link.human_access}
-                .pull-right
-                  = link_to group_ldap_group_link_path(@group, ldap_group_link), method: :delete, class: 'btn btn-danger btn-small' do
-                    = fa_icon('unlink', text: 'unlink')
-      - else
-        %p No links yet
-    = form_for [@group, @group.ldap_group_links.new] do |f|
-      %fieldset
-        %legend Add new LDAP link
-        %div.form-holder
-          .form-group.clearfix
-            = f.label :ldap_cn, class: 'control-label' do
-              LDAP Group cn
-            .col-sm-10
-              = f.hidden_field :cn, placeholder: "Ex. QA group", class: "xxlarge ajax-ldap-groups-select input-mn-300"
-              .help-block
-                Synchronize #{@group.name}'s members with this LDAP group.
-                %br
-                If you select an LDAP group you do not belong to you will lose ownership of #{@group.name}.
-
-          .form-group.clearfix
-            = f.label :group_access, class: 'control-label' do
-              LDAP Access
-            .col-sm-10
-              = f.select :group_access, options_for_select(UsersGroup.group_access_roles)
-              .help-block
-                Default, minimum permission level for LDAP group members of #{@group.name}.
-                %br
-                You can manage permission levels for individual group members in the Members tab.
-
-        .form-actions
-          = f.submit 'Save changes', class: "btn btn-primary"
-          = link_to  'Cancel', admin_group_path(@group), class: "btn btn-cancel"
-
+  = render 'groups/ldap_group_links/form', group: @group
diff --git a/app/views/groups/edit.html.haml b/app/views/groups/edit.html.haml
index c946529301..c8d376f3d9 100644
--- a/app/views/groups/edit.html.haml
+++ b/app/views/groups/edit.html.haml
@@ -41,32 +41,10 @@
                 %hr
                 = link_to 'Remove avatar', group_avatar_path(@group.to_param), data: { confirm: "Group avatar will be removed. Are you sure?"}, method: :delete, class: "btn btn-remove btn-small remove-avatar"
 
-          %fieldset
-            %legend LDAP settings
-            .form-group.clearfix
-              = f.label :ldap_cn, class: 'control-label' do
-                LDAP Group cn
-              .col-sm-10
-                = f.hidden_field :ldap_cn, placeholder: "Ex. QA group", class: "xxlarge ajax-ldap-groups-select input-mn-300"
-                .help-block
-                  Synchronize #{@group.name}'s members with this LDAP group.
-                  %br
-                  If you select an LDAP group you do not belong to you will lose ownership of #{@group.name}.
-
-            .form-group.clearfix
-              = f.label :ldap_access, class: 'control-label' do
-                LDAP Access
-              .col-sm-10
-                = f.select :ldap_access, options_for_select(UsersGroup.group_access_roles, @group.ldap_access)
-                .help-block
-                  Default, minimum permission level for LDAP group members of #{@group.name}.
-                  %br
-                  You can manage permission levels for individual group members in the Members tab.
-
-
           .form-actions
             = f.submit 'Save group', class: "btn btn-save"
 
+        = render 'groups/ldap_group_links/form', group: @group
     .panel.panel-danger
       .panel-heading Remove group
       .panel-body
diff --git a/app/views/groups/ldap_group_links/_form.html.haml b/app/views/groups/ldap_group_links/_form.html.haml
new file mode 100644
index 0000000000..f2055ac12e
--- /dev/null
+++ b/app/views/groups/ldap_group_links/_form.html.haml
@@ -0,0 +1,41 @@
+%section.ldap-group-links
+  %fieldset
+    %legend Current LDAP links
+    - if group.ldap_group_links.any?
+      %ul.bordered-list
+        - group.ldap_group_links.each do |ldap_group_link|
+          %li
+            %h4
+              = ldap_group_link.cn
+              %small.light== as #{ldap_group_link.human_access}
+              .pull-right
+                = link_to group_ldap_group_link_path(group, ldap_group_link), method: :delete, class: 'btn btn-danger btn-small' do
+                  = fa_icon('unlink', text: 'unlink')
+    - else
+      %p No links yet
+  = form_for [group, group.ldap_group_links.new] do |f|
+    %fieldset
+      %legend Add new LDAP link
+      %div.form-holder
+        .form-group.clearfix
+          = f.label :ldap_cn, class: 'control-label' do
+            LDAP Group cn
+          .col-sm-10
+            = f.hidden_field :cn, placeholder: "Ex. QA group", class: "xxlarge ajax-ldap-groups-select input-mn-300"
+            .help-block
+              Synchronize #{group.name}'s members with this LDAP group.
+              %br
+              If you select an LDAP group you do not belong to you will lose ownership of #{group.name}.
+
+        .form-group.clearfix
+          = f.label :group_access, class: 'control-label' do
+            LDAP Access
+          .col-sm-10
+            = f.select :group_access, options_for_select(UsersGroup.group_access_roles)
+            .help-block
+              Default, minimum permission level for LDAP group members of #{group.name}.
+              %br
+              You can manage permission levels for individual group members in the Members tab.
+
+      .form-actions
+        = f.submit 'Save changes', class: "btn btn-primary"