diff --git a/htdocs/resource/card.php b/htdocs/resource/card.php
index 18ee6f557caba..6680e279be89a 100644
--- a/htdocs/resource/card.php
+++ b/htdocs/resource/card.php
@@ -77,16 +77,18 @@
 }
 
 if (empty($reshook)) {
-	if ($cancel) {
-		if (!empty($backtopage)) {
-			header("Location: ".$backtopage);
-			exit;
-		}
-		if ($action == 'add') {
-			header("Location: ".DOL_URL_ROOT.'/resource/list.php');
-			exit;
+	$error = 0;
+
+	$backurlforlist = dol_buildpath('/resource/list.php', 1);
+
+	if (empty($backtopage) || ($cancel && empty($id))) {
+		if (empty($backtopage) || ($cancel && strpos($backtopage, '__ID__'))) {
+			if (empty($id) && (($action != 'add' && $action != 'create') || $cancel)) {
+				$backtopage = $backurlforlist;
+			} else {
+				$backtopage = dol_buildpath('/resource/card.php', 1).'?id='.((!empty($id) && $id > 0) ? $id : '__ID__');
+			}
 		}
-		$action = '';
 	}
 
 	include DOL_DOCUMENT_ROOT.'/core/actions_addupdatedelete.inc.php';
@@ -118,8 +120,11 @@
 		}
 
 		// Create/Edit object
-
-		print '<form action="'.$_SERVER["PHP_SELF"].'?id='.$id.'" method="POST">';
+		if($action == 'create') {
+			print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
+		} elseif ($action == 'edit') {
+			print '<form action="'.$_SERVER["PHP_SELF"].'?id='.$id.'" method="POST">';
+		}
 		print '<input type="hidden" name="token" value="'.newToken().'">';
 		print '<input type="hidden" name="action" value="'.($action == "create" ? "add" : "update").'">';