diff --git a/modules/blog/handler/blog_handler.e b/modules/blog/handler/blog_handler.e
index 2f731d6..768b869 100644
--- a/modules/blog/handler/blog_handler.e
+++ b/modules/blog/handler/blog_handler.e
@@ -158,7 +158,7 @@ feature -- HTML Output
 			lnk: CMS_LOCAL_LINK
 		do
 				-- Output the title. If more than one page, also output the current page number
-			append_page_title_html_to (a_output)
+			append_page_title_html_to (page, a_output)
 
 				-- Get the posts from the current page (given by page number and entries per page)
 				-- Start list of posts
@@ -174,7 +174,7 @@ feature -- HTML Output
 				append_creation_date_html_to (n, a_output)
 
 					-- Output the author of the post
-				append_author_html_to (n, a_output)
+				append_author_html_to (n, page, a_output)
 
 					-- Output the title of the post as a link (to the detail page)
 				append_title_html_to (n, page, a_output)
@@ -192,7 +192,7 @@ feature -- HTML Output
 			append_pagination_html_to (a_output)
 		end
 
-	append_page_title_html_to (a_output: STRING)
+	append_page_title_html_to (a_page: CMS_RESPONSE; a_output: STRING)
 			-- Append the title of the page as a html string to `a_output'.
 			-- It shows the current page number.
 		do
@@ -215,12 +215,12 @@ feature -- HTML Output
 			end
 		end
 
-	append_author_html_to (n: CMS_NODE; a_output: STRING)
+	append_author_html_to (n: CMS_NODE; a_page: CMS_RESPONSE; a_output: STRING)
 			-- Append to `a_output', the author of node `n' as html link to author's posts.
 		do
 			if attached n.author as l_author then
 				a_output.append ("by ")
-				a_output.append ("<a class=%"blog_user_link%" href=%"/blog/" + l_author.id.out + "%">" + html_encoded (l_author.name) + "</a>")
+				a_output.append ("<a class=%"blog_user_link%" href=%"/blog/" + l_author.id.out + "%">" + html_encoded (a_page.user_profile_name (l_author)) + "</a>")
 			end
 		end
 
diff --git a/modules/blog/handler/blog_user_handler.e b/modules/blog/handler/blog_user_handler.e
index def1f19..7a2b396 100644
--- a/modules/blog/handler/blog_user_handler.e
+++ b/modules/blog/handler/blog_user_handler.e
@@ -114,12 +114,12 @@ feature -- Query
 
 feature -- HTML Output
 
-	append_page_title_html_to (a_output: STRING)
+	append_page_title_html_to (a_page: CMS_RESPONSE; a_output: STRING)
 			-- Returns the title of the page as a html string. It shows the current page number and the name of the current user
 		do
 			a_output.append ("<h2>Posts from ")
 			if attached user as l_user then
-				a_output.append (html_encoded (l_user.name))
+				a_output.append (html_encoded (a_page.user_profile_name (l_user)))
 			else
 				a_output.append ("unknown user")
 			end
diff --git a/modules/node/handler/node_handler.e b/modules/node/handler/node_handler.e
index 4d79a1a..52d52eb 100644
--- a/modules/node/handler/node_handler.e
+++ b/modules/node/handler/node_handler.e
@@ -335,7 +335,7 @@ feature {NONE} -- Trash:Restore
 							b.append ("</a>")
 							if attached n.author as l_author then
 								b.append (" by ")
-								b.append (r.link (l_author.name, "user/" + l_author.id.out, Void))
+								b.append (r.link (r.user_profile_name (l_author), "user/" + l_author.id.out, Void))
 							end
 							if node_api.has_permission_for_action_on_node ("edit revisions", l_node, api.user) then
 								b.append (" (<a href=%"")
diff --git a/modules/node/handler/nodes_handler.e b/modules/node/handler/nodes_handler.e
index d8ee1be..7d87d1f 100644
--- a/modules/node/handler/nodes_handler.e
+++ b/modules/node/handler/nodes_handler.e
@@ -123,7 +123,7 @@ feature -- HTTP Methods
 				s.append (" | ")
 			end
 			if attached l_response.user as u and then l_response.has_permission ("view own trash") then
-				s.append (l_response.link ("Your-trash", "trash?user=" + l_response.url_encoded (u.name), Void))
+				s.append (l_response.link ("Your-trash", "trash?user=" + u.id.out, Void))
 				s.append (" | ")
 			end
 
diff --git a/modules/node/handler/trash_handler.e b/modules/node/handler/trash_handler.e
index 31d34ec..e032d3a 100644
--- a/modules/node/handler/trash_handler.e
+++ b/modules/node/handler/trash_handler.e
@@ -51,7 +51,11 @@ feature -- HTTP Methods
 			create {GENERIC_VIEW_CMS_RESPONSE} l_page.make (req, res, api)
 			if attached {WSF_STRING} req.query_parameter ("user") as p_username then
 				l_username := p_username.value
-				l_trash_owner := api.user_api.user_by_name (l_username)
+				if l_username.is_integer_64 then
+					l_trash_owner := api.user_api.user_by_id (l_username.to_integer_64)
+				else
+					l_trash_owner := api.user_api.user_by_name (l_username)
+				end
 			end
 			if
 				(l_trash_owner /= Void and then l_page.has_permissions (<<"view any trash", "view own trash">>))
@@ -59,7 +63,7 @@ feature -- HTTP Methods
 			then
 					-- NOTE: for development purposes we have the following hardcode output.
 				if l_trash_owner /= Void then
-					create s.make_from_string ("<p>Trash for user " + l_page.html_encoded (l_trash_owner.name) + "</p>")
+					create s.make_from_string ("<p>Trash for user " + l_page.html_encoded (l_page.user_profile_name (l_trash_owner)) + "</p>")
 				else
 					create s.make_from_string ("<p>Trash</p>")
 				end
diff --git a/modules/recent_changes/cms_recent_changes_module.e b/modules/recent_changes/cms_recent_changes_module.e
index 99420d1..8c958fd 100644
--- a/modules/recent_changes/cms_recent_changes_module.e
+++ b/modules/recent_changes/cms_recent_changes_module.e
@@ -346,7 +346,7 @@ feature -- Handler
 					l_content.append ("</td>")
 					l_content.append ("<td class=%"user%">")
 					if attached ch.author as u then
-						l_content.append (r.link (u.name, "user/" + u.id.out, Void))
+						l_content.append (r.link (r.user_profile_name (u), "user/" + u.id.out, Void))
 					elseif attached ch.author_name as un then
 						l_content.append (r.html_encoded (un))
 					end