diff --git a/examples/demo/site/modules/auth/templates/block_account_info.tpl b/examples/demo/site/modules/auth/templates/block_account_info.tpl
index bc77b3e..289ce5c 100644
--- a/examples/demo/site/modules/auth/templates/block_account_info.tpl
+++ b/examples/demo/site/modules/auth/templates/block_account_info.tpl
@@ -61,9 +61,7 @@
 	{unless isset="$user"}
 		<div>
 			<p> You are not logged in </p>
-			<form method="get" action="{$site_url/}{$auth.login/}">
-    			<button type="submit">Login</button>
-			</form>
+				<a href="{$site_url/}account/roc-login">Go to the login page</a>
 		</div>	
 	{/unless}
 	</div>
diff --git a/modules/auth/cms_authentication_module.e b/modules/auth/cms_authentication_module.e
index f815d2b..edeb3ff 100644
--- a/modules/auth/cms_authentication_module.e
+++ b/modules/auth/cms_authentication_module.e
@@ -102,9 +102,6 @@ feature -- Hooks configuration
 	value_table_alter (a_value: CMS_VALUE_TABLE; a_response: CMS_RESPONSE)
 			-- <Precursor>
 		do
-			if attached current_user (a_response.request) as l_user then
-				a_value.force (l_user, "user")
-			end
 		end
 
 
diff --git a/modules/auth/cms_login_form.e b/modules/auth/cms_login_form.e
deleted file mode 100644
index 3a825df..0000000
--- a/modules/auth/cms_login_form.e
+++ /dev/null
@@ -1,10 +0,0 @@
-note
-	description: "Summary description for {CMS_LOGIN_FORM}."
-	author: ""
-	date: "$Date$"
-	revision: "$Revision$"
-
-class
-	CMS_LOGIN_FORM
-
-end
diff --git a/modules/auth/site/templates/block_account_info.tpl b/modules/auth/site/templates/block_account_info.tpl
index bc77b3e..289ce5c 100644
--- a/modules/auth/site/templates/block_account_info.tpl
+++ b/modules/auth/site/templates/block_account_info.tpl
@@ -61,9 +61,7 @@
 	{unless isset="$user"}
 		<div>
 			<p> You are not logged in </p>
-			<form method="get" action="{$site_url/}{$auth.login/}">
-    			<button type="submit">Login</button>
-			</form>
+				<a href="{$site_url/}account/roc-login">Go to the login page</a>
 		</div>	
 	{/unless}
 	</div>