diff --git a/modules/admin/cms_admin_module.e b/modules/admin/cms_admin_module.e
index a922b9a..0245b9f 100644
--- a/modules/admin/cms_admin_module.e
+++ b/modules/admin/cms_admin_module.e
@@ -19,6 +19,8 @@ inherit
 
 	CMS_HOOK_BLOCK
 
+	CMS_REQUEST_UTIL
+
 create
 	make
 
@@ -120,8 +122,13 @@ feature -- Hooks
 		local
 			lnk: CMS_LOCAL_LINK
 		do
-			create lnk.make ("Admin", "admin")
-			a_menu_system.primary_menu.extend (lnk)
+			if
+				attached current_user (a_response.request) as l_user and then
+				a_response.api.user_api.is_admin_user (l_user)
+			then
+				create lnk.make ("Admin", "admin")
+				a_menu_system.primary_menu.extend (lnk)
+			end
 		end
 
 note
diff --git a/modules/admin/handler/role/cms_role_form_response.e b/modules/admin/handler/role/cms_role_form_response.e
index 36c296a..2c7b562 100644
--- a/modules/admin/handler/role/cms_role_form_response.e
+++ b/modules/admin/handler/role/cms_role_form_response.e
@@ -62,7 +62,8 @@ feature -- Process
 			create b.make_empty
 			uid := role_id_path_parameter (request)
 			if uid > 0 and then attached user_api.user_role_by_id (uid.to_integer) as l_role then
-				fixme ("refactor: process_edit, process_create process edit")
+				fixme ("Issues with  WSD_FORM_DATA.apply_to_associated_form")
+					-- if we have a WSF_FORM_CHECKBOK_INPUT, cheked inputs, are not preserverd in case of error.
 				if request.path_info.ends_with_general ("/edit") then
 					edit_form (l_role)
 				elseif request.path_info.ends_with_general ("/delete") then