diff --git a/lam/lib/modules.inc b/lam/lib/modules.inc
index 0c056512..d87bc340 100644
--- a/lam/lib/modules.inc
+++ b/lam/lib/modules.inc
@@ -827,9 +827,9 @@ class accountContainer {
 						$result = 0;
 					}
 					if ($post['backmain']) {
-						// Return to *-list
-						// *** fixme unset accountContainer in session
-						metaRefresh("../lists/list".$this->type."s.php");
+						// Return to account list
+						unset($_SESSION[$this->base]);
+						metaRefresh("../lists/list.php?type=" . $this->type);
 						exit;
 					}
 					if ($post['outputpdf']) {
diff --git a/lam/templates/delete.php b/lam/templates/delete.php
index 07966418..a399a584 100644
--- a/lam/templates/delete.php
+++ b/lam/templates/delete.php
@@ -117,7 +117,7 @@ if ($_GET['type']) {
 
 if ($_POST['cancel']) {
 	if (isset($_SESSION['delete_dn'])) unset($_SESSION['delete_dn']);
-	metaRefresh("lists/list" . $_POST['type'] . "s.php");
+	metaRefresh("lists/list.php?type=" . $_POST['type']);
 }
 
 if ($_POST['delete']) {