diff --git a/lam/lib/modules.inc b/lam/lib/modules.inc
index 72463f46..4001f6ee 100644
--- a/lam/lib/modules.inc
+++ b/lam/lib/modules.inc
@@ -1071,6 +1071,10 @@ class accountContainer {
 					if ($this->dn == $suffix) $options_selected = array($suffix);
 					$suffixes[] = $suffix;
 				}
+				if (!in_array($this->dn, $suffixes)) {
+					$suffixes[] = $this->dn;
+					$options_selected = array($this->dn);
+				}
 				$return[] = array(
 					0 => array('kind' => 'text', 'text' => _('Suffix')),
 					1 => array('kind' => 'select', 'name' => 'suffix', 'options' => $suffixes, 'options_selected' => $options_selected, 'noSorting' => true),