diff --git a/lam/lib/modules/main.inc b/lam/lib/modules/main.inc
index 16fab00e..55c3c6f7 100644
--- a/lam/lib/modules/main.inc
+++ b/lam/lib/modules/main.inc
@@ -283,23 +283,6 @@ class main extends baseModule {
 		return $return;
 		}
 
-	function get_profileOptions() {
-		$return = array();
-		$suffixes = array();
-		// get root suffix
-		$rootsuffix = call_user_func(array($_SESSION['config'], 'get_' . ucfirst($_SESSION[$this->base]->type) . 'Suffix'));
-		// get subsuffixes
-		foreach ($_SESSION['ldap']->search_units($rootsuffix) as $suffix) {
-			$suffixes[] = $suffix;
-		}
-		$return[] = array(
-			0 => array('kind' => 'text', 'text' => _('Suffix') . ': '),
-			1 => array('kind' => 'select', 'name' => 'main_suffix', 'options' => $suffixes, 'option_selected' => array($rootsuffix)),
-			2 => array('kind' => 'help', 'value' => 'TODO')
-			);
-		return $return;
-	}
-	
 	function get_pdfFields($account_type="user") {
 		return array(	'dn');
 	}
diff --git a/lam/templates/profedit/profilepage.php b/lam/templates/profedit/profilepage.php
index 03e1954b..76ca172e 100644
--- a/lam/templates/profedit/profilepage.php
+++ b/lam/templates/profedit/profilepage.php
@@ -75,6 +75,24 @@ if ($_GET['edit']) {
 // display formular
 echo ("<form action=\"profilecreate.php?type=$type\" method=\"post\">\n");
 
+// suffix box
+// get root suffix
+$rootsuffix = call_user_func(array($_SESSION['config'], 'get_' . ucfirst($type) . 'Suffix'));
+// get subsuffixes
+$suffixes = array();
+foreach ($_SESSION['ldap']->search_units($rootsuffix) as $suffix) {
+	$suffixes[] = $suffix;
+}
+if (sizeof($suffixes) > 0) {
+echo "<fieldset>\n<legend><b>" . _("LDAP suffix") . "</b></legend>\n";
+	echo _("LDAP suffix") . ":&nbsp;&nbsp;";
+	echo "<select>";
+	for ($i = 0; $i < sizeof($suffixes); $i++) echo "<option>" . $suffixes[$i] . "</option>\n";
+	echo "</select>\n";
+	echo "&nbsp;&nbsp;<a href=../help.php?HelpNumber=TODO>" . _('Help') . "</a>\n";
+echo "</fieldset>\n<br>\n";
+}
+
 // display module options
 $modules = array_keys($options);
 for ($m = 0; $m < sizeof($modules); $m++) {