diff --git a/draft/application/cms/src/modules/user/user_new_password_cms_execution.e b/draft/application/cms/src/modules/user/user_new_password_cms_execution.e
index e5f6801b..97f372ff 100644
--- a/draft/application/cms/src/modules/user/user_new_password_cms_execution.e
+++ b/draft/application/cms/src/modules/user/user_new_password_cms_execution.e
@@ -32,7 +32,7 @@ feature -- Execution
 				initialize_primary_tabs (u)
 				if u /= Void then
 					if attached u.email as l_email then
-						f := new_password_form (request.path_info, "new-password")
+						f := new_password_form (url (request.path_info, Void), "new-password")
 						b.append ("Password reset instructions will be mailed to <em>" + l_email + "</em>. You must " +  link ("log out", "/user/logout", Void)  + " to use the password reset link in the e-mail.")
 						b.append (f.to_html (theme))
 					else
diff --git a/draft/application/cms/src/modules/user/user_register_cms_execution.e b/draft/application/cms/src/modules/user/user_register_cms_execution.e
index 60904529..95395022 100644
--- a/draft/application/cms/src/modules/user/user_register_cms_execution.e
+++ b/draft/application/cms/src/modules/user/user_register_cms_execution.e
@@ -34,7 +34,7 @@ feature -- Execution
 				b.append ("You are already " + link ("signed in", "/user", Void) + ", please " + link ("signout", "/user/logout", Void) + " before trying to " + link ("register a new account", "/account/register", Void) + ".")
 				set_redirection (url ("/user", Void))
 			else
-				f := registration_form (request.path_info, "reg")
+				f := registration_form (url (request.path_info, Void), "reg")
 
 				if request.is_post_request_method then
 					create fd.make (request, f)