diff --git a/draft/application/cms/src/modules/node/node_add_cms_execution.e b/draft/application/cms/src/modules/node/node_add_cms_execution.e
index 3e4e58ab..0176576b 100644
--- a/draft/application/cms/src/modules/node/node_add_cms_execution.e
+++ b/draft/application/cms/src/modules/node/node_add_cms_execution.e
@@ -25,7 +25,7 @@ feature -- Execution
 			create b.make_empty
 			if attached non_empty_string_path_parameter ("type") as s_type then
 				if attached service.content_type (s_type) as l_type then
-					f := edit_form (Void, request.path_info, "add-" + l_type.name, l_type)
+					f := edit_form (Void, url (request.path_info, Void), "add-" + l_type.name, l_type)
 					if request.is_post_request_method then
 						create fd.make (request, f)
 						l_preview := attached {WSF_STRING} fd.item ("op") as l_op and then l_op.same_string ("Preview")
diff --git a/draft/application/cms/src/modules/node/node_edit_cms_execution.e b/draft/application/cms/src/modules/node/node_edit_cms_execution.e
index 511993e3..778c12d1 100644
--- a/draft/application/cms/src/modules/node/node_edit_cms_execution.e
+++ b/draft/application/cms/src/modules/node/node_edit_cms_execution.e
@@ -30,7 +30,7 @@ feature -- Execution
 			then
 				if attached service.content_type (l_node.content_type_name) as l_type then
 					if has_permission ("edit " + l_type.name) then
-						f := edit_form (l_node, request.path_info, "edit-" + l_type.name, l_type)
+						f := edit_form (l_node, url (request.path_info, Void), "edit-" + l_type.name, l_type)
 						if request.is_post_request_method then
 							create fd.make (request, f)
 							l_preview := attached {WSF_STRING} fd.item ("op") as l_op and then l_op.same_string ("Preview")
diff --git a/draft/application/cms/src/modules/user/user_edit_cms_execution.e b/draft/application/cms/src/modules/user/user_edit_cms_execution.e
index c39000fb..b0af2ec5 100644
--- a/draft/application/cms/src/modules/user/user_edit_cms_execution.e
+++ b/draft/application/cms/src/modules/user/user_edit_cms_execution.e
@@ -47,7 +47,7 @@ feature -- Execution
 				set_redirection (url ("/user/register", Void))
 			else
 				service.storage.fill_user_profile (u)
-				f := edit_form (u, request.path_info, "user-edit")
+				f := edit_form (u, url (request.path_info, Void), "user-edit")
 
 				if request.is_post_request_method then
 					create fd.make (request, f)