diff --git a/contrib/bin/fusiondirectory-setup b/contrib/bin/fusiondirectory-setup
index 38d6123a9a4807d70d103def9f479e4f9269a5fb..7b75f813b0d6c6ac8c2549f06307fea0f0f68e19 100644
--- a/contrib/bin/fusiondirectory-setup
+++ b/contrib/bin/fusiondirectory-setup
@@ -1724,8 +1724,8 @@ sub read_ldap_config {
     if (($mesg->entries)[0]->exists('fdUserRDN')) {
       $userrdn = ($mesg->entries)[0]->get_value('fdUserRDN');
     }
-    if (($mesg->entries)[0]->exists('fdGroupRDN')) {
-      $grouprdn = ($mesg->entries)[0]->get_value('fdGroupRDN');
+    if (($mesg->entries)[0]->exists('fdOGroupRDN')) {
+      $grouprdn = ($mesg->entries)[0]->get_value('fdOGroupRDN');
     }
     if (($mesg->entries)[0]->exists('fdAclRoleRDN')) {
       $aclrolerdn = ($mesg->entries)[0]->get_value('fdAclRoleRDN');
diff --git a/include/class_config.inc b/include/class_config.inc
index d63109e729f238cddf34e701199bdd3a13abf577..f543343462249120ade8b4e83b52a730a933e4aa 100644
--- a/include/class_config.inc
+++ b/include/class_config.inc
@@ -398,10 +398,6 @@ class config
     /* Load in-ldap configuration */
     $this->load_inldap_config();
 
-    /* Remove possibly added ',' from end of group and people ou */
-    $this->current['GROUPRDN']  = preg_replace("/,*$/", "", $this->current['GROUPRDN']);
-    $this->current['USERRDN']   = preg_replace("/,*$/", "", $this->current['USERRDN']);
-
     /* We update LDAPSIZELIMIT as it may have been changed by ldap config */
     session::global_set('size_limit', $this->current['LDAPSIZELIMIT']);
 
diff --git a/include/functions.inc b/include/functions.inc
index a120472697cca7ed6080fa00ac1e67958048da74..45860775626d019a72f9281a0cac4e9ff7f9b350 100644
--- a/include/functions.inc
+++ b/include/functions.inc
@@ -1116,17 +1116,6 @@ function get_people_ou()
   return get_ou('userRDN');
 }
 
-/*! \brief Get the OU for groups
- *
- * Function for getting the groupRDN
- *
- * \return the ou of the groupRDN
- */
-function get_groups_ou()
-{
-  return get_ou('groupRDN');
-}
-
 /*! \brief Return a base from a given user DN
  *
  * \code
@@ -1328,8 +1317,8 @@ function dn2base($dn, $ou = NULL)
     if (get_people_ou() != '') {
       $dn = preg_replace('/,'.get_people_ou().'/i', ',', $dn);
     }
-    if (get_groups_ou() != '') {
-      $dn = preg_replace('/,'.get_groups_ou().'/i', ',', $dn);
+    if (get_ou('groupRDN') != '') {
+      $dn = preg_replace('/,'.get_ou('groupRDN').'/i', ',', $dn);
     }
   } else {
     $dn = preg_replace("/,$ou/i", ',', $dn);
diff --git a/plugins/config/class_configInLdap.inc b/plugins/config/class_configInLdap.inc
index f4ae437a33169542e0758d7bb2fdfaab86c8ccb8..58696221b6838ca37f4ded88f757d68f192e6116 100644
--- a/plugins/config/class_configInLdap.inc
+++ b/plugins/config/class_configInLdap.inc
@@ -299,11 +299,6 @@ class configInLdap extends simplePlugin
             'fdUserRDN', TRUE,
             'ou=people'
           ),
-          new StringAttribute (
-            _('Groups RDN'), _('The branch where groups are stored.'),
-            'fdGroupRDN', TRUE,
-            'ou=groups'
-          ),
           new StringAttribute (
             _('ACL role RDN'), _('The branch where ACL roles are stored.'),
             'fdAclRoleRDN', TRUE,
diff --git a/plugins/config/class_mainPluginsConfig.inc b/plugins/config/class_mainPluginsConfig.inc
index 6024cbe8976c4de8e479692955a454a643aba771..db2479fecc3f28df17a8442371217940cdfa20b5 100644
--- a/plugins/config/class_mainPluginsConfig.inc
+++ b/plugins/config/class_mainPluginsConfig.inc
@@ -1,7 +1,7 @@
 <?php
 /*
   This code is part of FusionDirectory (http://www.fusiondirectory.org/)
-  Copyright (C) 2012-2016 FusionDirectory
+  Copyright (C) 2012-2017 FusionDirectory
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -42,7 +42,7 @@ class mainPluginsConfig extends simplePlugin
         'name'  => _('Object groups'),
         'attrs' => array(
           new StringAttribute (
-            _('OGroup RDN'), _('Branch in which object groups will be stored'),
+            _('Groups RDN'), _('Branch in which object groups will be stored'),
             'fdOGroupRDN', TRUE,
             'ou=groups'
           ),