diff --git a/api/src/Accounts/Ads.php b/api/src/Accounts/Ads.php
index ade53aeece..eae9ebf7a4 100644
--- a/api/src/Accounts/Ads.php
+++ b/api/src/Accounts/Ads.php
@@ -1196,7 +1196,14 @@ class Ads
 			case 'g':
 				/** @noinspection SuspiciousAssignmentsInspection */
 				$type_filter = '(|(samaccounttype=' . adLDAP::ADLDAP_SECURITY_GLOBAL_GROUP .
-					')(samaccounttype=' . adLDAP::ADLDAP_SECURITY_LOCAL_GROUP . '))';
+					')(samaccounttype=' . adLDAP::ADLDAP_SECURITY_LOCAL_GROUP;
+				// should we also consider distribution-lists
+				if (!empty($this->frontend->config['ads_group_extra_types']) && $this->frontend->config['ads_group_extra_types'] === 'distributionlists')
+				{
+					$type_filter .= ')(samaccounttype=' . adLDAP::ADLDAP_DISTRIBUTION_GROUP.
+						')(samaccounttype=' . adLDAP::ADLDAP_DISTRIBUTION_LOCAL_GROUP;
+				}
+				$type_filter .=	'))';
 				if (!empty($this->frontend->config['ads_group_filter']))
 				{
 					$type_filter = '(&' . $type_filter . $this->frontend->config['ads_group_filter'] . ')';
diff --git a/setup/lang/egw_de.lang b/setup/lang/egw_de.lang
index f70de9d288..48a9d58ed4 100644
--- a/setup/lang/egw_de.lang
+++ b/setup/lang/egw_de.lang
@@ -258,6 +258,7 @@ deregistered	setup	de	nicht registriert
 details for admin account	setup	de	Details des Admin-Kontos
 developers' table schema toy	setup	de	Entwickler Tabellen Schema "Spielzeug"
 did not find any valid db support!	setup	de	Konnte keine gültige Datenbankunterstützung finden!
+distribution-lists too	setup	de	auch Verteilerlisten
 do not check for deleted user	setup	de	Nicht auf gelöschte Benutzer prüfen
 do you want persistent connections (higher performance, but consumes more resources)	setup	de	Wollen Sie eine permanente Datenbankverbindung verwenden?<br>(höhere Performance, braucht aber mehr Ressourcen)
 do you want to manage homedirectory and loginshell attributes?	setup	de	Wollen Sie Benutzerverzeichnisse und Login-Shell Attribute verwalten?
diff --git a/setup/lang/egw_en.lang b/setup/lang/egw_en.lang
index 88c2a2e8d8..1e8822050c 100644
--- a/setup/lang/egw_en.lang
+++ b/setup/lang/egw_en.lang
@@ -258,6 +258,7 @@ deregistered	setup	en	De-registered
 details for admin account	setup	en	Details for Admin account
 developers' table schema toy	setup	en	Developers' Table Schema Toy
 did not find any valid db support!	setup	en	Did not find any valid DB support!
+distribution-lists too	setup	en	distribution-lists too
 do not check for deleted user	setup	en	Do NOT check for deleted user
 do you want persistent connections (higher performance, but consumes more resources)	setup	en	Do you want persistent connections (higher performance, but consumes more resources)
 do you want to manage homedirectory and loginshell attributes?	setup	en	Do you want to manage home directory and login shell attributes?
diff --git a/setup/templates/default/config.tpl b/setup/templates/default/config.tpl
index 4ebe203399..daf7cc40ea 100644
--- a/setup/templates/default/config.tpl
+++ b/setup/templates/default/config.tpl
@@ -430,7 +430,11 @@
      <td>
      	{lang_Group_context}: ({lang_leave_empty_to_use_default})
      </td>
-     <td><input name="newsettings[ads_group_context]" value="{value_ads_group_context}" size="80" /></td>
+     <td>
+        <input name="newsettings[ads_group_context]" value="{value_ads_group_context}" size="80" />
+        <label><input type="checkbox" value="distributionlists" {checked_ads_group_extra_types_distributionlists} name="newsettings[ads_group_extra_types]"/>
+            {lang_distribution-lists too}</label>
+     </td>
    </tr>
    <tr class="row_on">
      <td>{lang_Additional_user_filter_(optional)}:</td>