diff --git a/lam/templates/lists/listgroups.php b/lam/templates/lists/listgroups.php
index e9325912..f6ef204a 100644
--- a/lam/templates/lists/listgroups.php
+++ b/lam/templates/lists/listgroups.php
@@ -45,7 +45,7 @@ $grp_units = $_SESSION['grp_units'];
 if ($_POST['new_group'] || $_POST['del_group']){
 	// add new group
 	if ($_POST['new_group']){
-		metaRefresh("../account.php?type=group");
+		metaRefresh("../account/groupedit.php");
 		exit;
 	}
 	// delete group(s)
@@ -189,10 +189,10 @@ for ($i = $table_begin; $i < $table_end; $i++) {
 	echo("<tr class=\"grouplist\" onMouseOver=\"group_over(this, '" . $grp_info[$i]["dn"] . "')\"" .
 								" onMouseOut=\"group_out(this, '" . $grp_info[$i]["dn"] . "')\"" .
 								" onClick=\"group_click(this, '" . $grp_info[$i]["dn"] . "')\"" .
-								" onDblClick=\"parent.frames[1].location.href='../account.php?type=group&amp;DN=" . $grp_info[$i]["dn"] . "'\">" .
+								" onDblClick=\"parent.frames[1].location.href='../account/groupedit.php?DN=" . $grp_info[$i]["dn"] . "'\">" .
 								" <td height=22><input onClick=\"group_click(this, '" . $grp_info[$i]["dn"] . "')\" type=\"checkbox\" name=\"" . $grp_info[$i]["dn"] . "\"></td>" .
 								" <td align='center'><a href=\"../groupmembers.php?DN='" . $grp_info[$i]["dn"] . "'\">" . _("Members") . "</a>" .
-									"<hr><a href=\"../account.php?type=group&amp;DN='" . $grp_info[$i]["dn"] . "'\">" . _("Edit") . "</a></td>");
+									"<hr><a href=\"../account/groupedit.php?DN='" . $grp_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 e1c37dee..371710c1 100644
--- a/lam/templates/lists/listhosts.php
+++ b/lam/templates/lists/listhosts.php
@@ -45,7 +45,7 @@ $hst_units = $_SESSION['hst_units'];
 if ($_POST['new_host'] || $_POST['del_host']){
 	// add new host
 	if ($_POST['new_host']){
-		metaRefresh("../account.php?type=host");
+		metaRefresh("../account/hostedit.php");
 		exit;
 	}
 	// delete host(s)
@@ -195,9 +195,9 @@ for ($i = $table_begin; $i < $table_end; $i++) {
 	echo("<tr class=\"hostlist\" onMouseOver=\"host_over(this, '" . $hst_info[$i]["dn"] . "')\"" .
 								" onMouseOut=\"host_out(this, '" . $hst_info[$i]["dn"] . "')\"" .
 								" onClick=\"host_click(this, '" . $hst_info[$i]["dn"] . "')\"" .
-								" onDblClick=\"parent.frames[1].location.href='../account.php?type=host&amp;DN=" . $hst_info[$i]["dn"] . "'\">" .
+								" onDblClick=\"parent.frames[1].location.href='../account/hostedit.php?DN=" . $hst_info[$i]["dn"] . "'\">" .
 								" <td height=22><input onClick=\"host_click(this, '" . $hst_info[$i]["dn"] . "')\" type=\"checkbox\" name=\"" . $hst_info[$i]["dn"] . "\"></td>" .
-								" <td align='center'><a href=\"../account.php?type=host&amp;DN='" . $hst_info[$i]["dn"] . "'\">" . _("Edit") . "</a></td>");
+								" <td align='center'><a href=\"../account/hostedit.php?DN='" . $hst_info[$i]["dn"] . "'\">" . _("Edit") . "</a></td>");
 	for ($k = 0; $k < sizeof($attr_array); $k++) {
 		echo ("<td>");
 		// print all attribute entries seperated by "; "