diff --git a/lam/templates/lists/listusers.php b/lam/templates/lists/listusers.php
index 774aadcb..73a8ce8f 100644
--- a/lam/templates/lists/listusers.php
+++ b/lam/templates/lists/listusers.php
@@ -66,7 +66,7 @@ $usr_units = $_SESSION['usr_units'];
 if ($_POST['new_user'] || $_POST['del_user'] || $_POST['pdf_user'] || $_POST['pdf_all']){
 	// add new user
 	if ($_POST['new_user']){
-		metaRefresh("../account.php?type=user");
+		metaRefresh("../account/useredit.php?type=user");
 		exit;
 	}
 	// delete user(s)
@@ -258,10 +258,10 @@ if ($user_count != 0) {
 		echo("<tr class=\"userlist\"\nonMouseOver=\"user_over(this, '" . $userinfo[$i]["dn"] . "')\"\n" .
 			"onMouseOut=\"user_out(this, '" . $userinfo[$i]["dn"] . "')\"\n" .
 			"onClick=\"user_click(this, '" . $userinfo[$i]["dn"] . "')\"\n" .
-			"onDblClick=\"parent.frames[1].location.href='../account.php?type=user&amp;DN=" . $userinfo[$i]["dn"] . "'\">\n" .
+			"onDblClick=\"parent.frames[1].location.href='../account/useredit.php?type=user&amp;DN=" . $userinfo[$i]["dn"] . "'\">\n" .
 			"<td height=22>\n<input onClick=\"user_click(this, '" . $userinfo[$i]["dn"] . "')\" type=\"checkbox\" name=\"" .
 			$userinfo[$i]["dn"] . "\">\n</td>\n" .
-			"<td align='center'>\n<a href=\"../account.php?type=user&amp;DN='" . $userinfo[$i]["dn"] . "'\">" .
+			"<td align='center'>\n<a href=\"../account/useredit.php?type=user&amp;DN='" . $userinfo[$i]["dn"] . "'\">" .
 			_("Edit") . "</a>\n</td>\n");
 		for ($k = 0; $k < sizeof($attr_array); $k++) {
 			echo ("<td>\n");
diff --git a/lam/templates/lists/userlink.php b/lam/templates/lists/userlink.php
index a3cc1004..e51d7c2a 100644
--- a/lam/templates/lists/userlink.php
+++ b/lam/templates/lists/userlink.php
@@ -19,7 +19,7 @@ $Id$
   along with this program; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-  This page will redirect to account.php if the given user is valid.
+  This page will redirect to account/useredit.php if the given user is valid.
   It is called from listgroups.php via the memberUID links.
 
 */
@@ -40,8 +40,8 @@ $user = str_replace("\'", '',$user);
 $dn = $_SESSION['ldap']->search_username($user);
 
 if ($dn) {
-	// redirect to account.php
-	metaRefresh("../account.php?type=user&amp;DN='$dn'");
+	// redirect to account/useredit.php
+	metaRefresh("../account/useredit.php?type=user&amp;DN='$dn'");
 
 }
 else {