diff --git a/lam/templates/lists/listgroups.php b/lam/templates/lists/listgroups.php
index 9ef764ac..a5334de6 100644
--- a/lam/templates/lists/listgroups.php
+++ b/lam/templates/lists/listgroups.php
@@ -179,7 +179,7 @@ if (sizeof($info) > 0) {
 		echo("<tr class=\"grouplist\" onMouseOver=\"group_over(this, '" . $i . "')\"" .
 									" onMouseOut=\"group_out(this, '" . $i . "')\"" .
 									" onClick=\"group_click(this, '" . $i . "')\"" .
-									" onDblClick=\"parent.frames[1].location.href='../account/edit.php?type=group&amp;DN=" . $i . "'\">");
+									" onDblClick=\"parent.frames[1].location.href='../account/edit.php?type=group&amp;DN=" . $info[$i]['dn'] . "'\">");
 		if ($_GET['selectall'] == "yes") {
 		echo " <td height=22 align=\"center\"><input onClick=\"group_click(this, '" . $i . "')\" type=\"checkbox\"" .
 			" name=\"" . $i . "\" checked></td>";
@@ -188,7 +188,7 @@ if (sizeof($info) > 0) {
 		echo " <td height=22 align=\"center\"><input onClick=\"group_click(this, '" . $i . "')\" type=\"checkbox\"" .
 			" name=\"" . $i . "\"></td>";
 		}
-		echo (" <td align='center'><a href=\"../account/edit.php?type=group&amp;DN='" . $i . "'\">" . _("Edit") . "</a></td>");
+		echo (" <td align='center'><a href=\"../account/edit.php?type=group&amp;DN='" . $info[$i]['dn'] . "'\">" . _("Edit") . "</a></td>");
 		for ($k = 0; $k < sizeof($attr_array); $k++) {
 			echo ("<td>");
 			// print all attribute entries seperated by "; "
diff --git a/lam/templates/lists/listhosts.php b/lam/templates/lists/listhosts.php
index 72904fe5..898e8273 100644
--- a/lam/templates/lists/listhosts.php
+++ b/lam/templates/lists/listhosts.php
@@ -179,7 +179,7 @@ if (sizeof($info) > 0) {
 		echo("<tr class=\"hostlist\" onMouseOver=\"host_over(this, '" . $i . "')\"" .
 									" onMouseOut=\"host_out(this, '" . $i . "')\"" .
 									" onClick=\"host_click(this, '" . $i . "')\"" .
-									" onDblClick=\"parent.frames[1].location.href='../account/edit.php?type=host&amp;DN=" . $i . "'\">");
+									" onDblClick=\"parent.frames[1].location.href='../account/edit.php?type=host&amp;DN=" . $info[$i]['dn'] . "'\">");
 		if ($_GET['selectall'] == "yes") {
 		echo " <td height=22 align=\"center\"><input onClick=\"host_click(this, '" . $i . "')\"" .
 					" type=\"checkbox\" checked name=\"" . $i . "\"></td>";
@@ -188,7 +188,7 @@ if (sizeof($info) > 0) {
 		echo " <td height=22 align=\"center\"><input onClick=\"host_click(this, '" . $i . "')\"" .
 					" type=\"checkbox\" name=\"" . $i . "\"></td>";
 		}
-		echo (" <td align='center'><a href=\"../account/edit.php?type=host&amp;DN='" . $i . "'\">" . _("Edit") . "</a></td>");
+		echo (" <td align='center'><a href=\"../account/edit.php?type=host&amp;DN='" . $info[$i]['dn'] . "'\">" . _("Edit") . "</a></td>");
 		for ($k = 0; $k < sizeof($attr_array); $k++) {
 			echo ("<td>");
 			// print all attribute entries seperated by "; "
diff --git a/lam/templates/lists/listusers.php b/lam/templates/lists/listusers.php
index f900c980..de6771ac 100644
--- a/lam/templates/lists/listusers.php
+++ b/lam/templates/lists/listusers.php
@@ -227,7 +227,7 @@ if ($user_count != 0) {
 		echo("<tr class=\"userlist\"\nonMouseOver=\"user_over(this, '" . $i . "')\"\n" .
 			"onMouseOut=\"user_out(this, '" . $i . "')\"\n" .
 			"onClick=\"user_click(this, '" . $i . "')\"\n" .
-			"onDblClick=\"parent.frames[1].location.href='../account/edit.php?type=user&amp;DN=" . $i . "'\">\n");
+			"onDblClick=\"parent.frames[1].location.href='../account/edit.php?type=user&amp;DN=" . $info[$i]['dn'] . "'\">\n");
 		// checkboxes if selectall = "yes"
 		if ($_GET['selectall'] == "yes") {
 			echo "<td height=22 align=\"center\">\n<input onClick=\"user_click(this, '" . $i . "')\" type=\"checkbox\" name=\"" .
@@ -237,7 +237,7 @@ if ($user_count != 0) {
 			echo "<td height=22 align=\"center\">\n<input onClick=\"user_click(this, '" . $i . "')\" type=\"checkbox\" name=\"" .
 				$i . "\">\n</td>\n";
 		}
-		echo ("<td align='center'>\n<a href=\"../account/edit.php?type=user&amp;DN='" . $i . "'\">" .
+		echo ("<td align='center'>\n<a href=\"../account/edit.php?type=user&amp;DN='" . $info[$i]['dn'] . "'\">" .
 			_("Edit") . "</a>\n</td>\n");
 		for ($k = 0; $k < sizeof($attr_array); $k++) {
 			echo ("<td>\n");