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 debcd47..bc77b3e 100644
--- a/examples/demo/site/modules/auth/templates/block_account_info.tpl
+++ b/examples/demo/site/modules/auth/templates/block_account_info.tpl
@@ -1,5 +1,5 @@
  	<div class="primary-tabs">
-		{if isset="$user"}
+	 {if isset="$user"}
 		<h3>Account Information</h3>
 		<div>
 			<div>
@@ -16,7 +16,7 @@
 			   		<label>Last login:</label>  {$user.last_login_date/}
 			   	</div>	
 			   	<div>
-			   		<form method="get" action="{$site_url/}account/{$strategy/}">
+			   		<form method="get" action="{$site_url/}{$auth_login_strategy/}">
     					<button type="submit">Logout</button>
 					</form>
 			   	</div>	
@@ -57,6 +57,13 @@
 			   	</div>
     		{/foreach}
     	</div>		
-	
-		{/if}
+	{/if}
+	{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>
+		</div>	
+	{/unless}
 	</div>
diff --git a/examples/demo/site/modules/auth/templates/block_login.tpl b/examples/demo/site/modules/auth/templates/block_login.tpl
index 0549b24..891cb15 100644
--- a/examples/demo/site/modules/auth/templates/block_login.tpl
+++ b/examples/demo/site/modules/auth/templates/block_login.tpl
@@ -25,10 +25,5 @@
 				</p>
 			</div>
 		</div>	
-		<div>
-			{foreach item="item" from="$oauth_consumers"}
-				<a href="{$site_url/}account/login-with-oauth/{$item/}">Login with {$item/}</a><br>
-			{/foreach}	
-		</div>    	
-		{/unless}
-	</div>
+	{/unless}
+</div>
diff --git a/examples/demo/site/modules/auth/templates/block_new_password.tpl b/examples/demo/site/modules/auth/templates/block_new_password.tpl
index ef5407f..b057d87 100644
--- a/examples/demo/site/modules/auth/templates/block_new_password.tpl
+++ b/examples/demo/site/modules/auth/templates/block_new_password.tpl
@@ -1,7 +1,7 @@
  <div>
-    <form action="/account/new-password" method="post">
+    <form action="{$site_url/}account/new-password" method="post">
         <fieldset>
-            <legend>Require new password</legend>
+            <legend>Require new password by email</legend>
             <div>
                 <input type="email" id="email" name="email"  value="{$email/}"  required/>
                 <label for="email">Email</label>
@@ -13,4 +13,20 @@
             <button type="submit">Send</button>
         </fieldset>    
     </form>
+    <hr>
+    <form action="{$site_url/}account/new-password" method="post">
+        <fieldset>
+            <legend>Require new password by username</legend>
+            <div>
+                <input type="text" id="username" name="username"  value="{$username/}"  required/>
+                <label for="username">Username</label>
+                {if isset="$error_username"}
+                    <span><i>{$error_username/}</i></span> <br>
+                {/if}
+                <br>
+            </div>
+            <button type="submit">Send</button>
+        </fieldset>    
+    </form>
+
 </div>
diff --git a/examples/demo/site/modules/auth/templates/block_reactivate.tpl b/examples/demo/site/modules/auth/templates/block_reactivate.tpl
index bef65c0..0146aa2 100644
--- a/examples/demo/site/modules/auth/templates/block_reactivate.tpl
+++ b/examples/demo/site/modules/auth/templates/block_reactivate.tpl
@@ -1,5 +1,5 @@
  <div>
-    <form action="/account/reactivate" method="post">
+    <form action="{$site_url/}account/reactivate" method="post">
         <fieldset>
             <legend>Reactivate Form</legend>
             <div>
diff --git a/examples/demo/site/modules/auth/templates/block_register.tpl b/examples/demo/site/modules/auth/templates/block_register.tpl
index 58a4872..9e7c478 100644
--- a/examples/demo/site/modules/auth/templates/block_register.tpl
+++ b/examples/demo/site/modules/auth/templates/block_register.tpl
@@ -1,5 +1,5 @@
  <div>
-    <form action="/account/roc-register" method="post">
+    <form action="{$site_url/}account/roc-register" method="post">
         <fieldset>
             <legend>Register Form</legend>
             <div>
diff --git a/examples/demo/site/modules/auth/templates/block_reset_password.tpl b/examples/demo/site/modules/auth/templates/block_reset_password.tpl
index b99289d..0101587 100644
--- a/examples/demo/site/modules/auth/templates/block_reset_password.tpl
+++ b/examples/demo/site/modules/auth/templates/block_reset_password.tpl
@@ -1,5 +1,5 @@
  <div>
-    <form action="/account/reset-password" method="post">
+    <form action="{$site_url/}account/reset-password" method="post">
         <fieldset>
             <legend>Generate New Password Form</legend>
             <div>
diff --git a/modules/auth/cms_authentication_module.e b/modules/auth/cms_authentication_module.e
index 4a714e6..f815d2b 100644
--- a/modules/auth/cms_authentication_module.e
+++ b/modules/auth/cms_authentication_module.e
@@ -343,6 +343,24 @@ feature -- Handler
 						r.values.force (l_email.value, "email")
 						r.set_status_code ({HTTP_CONSTANTS}.bad_request)
 					end
+				elseif attached {WSF_STRING} req.form_parameter ("username") as l_username then
+					if 	attached {CMS_USER} l_user_api.user_by_name (l_username) as l_user and then
+						attached l_user.email as l_email
+					then
+								-- User exist create a new token and send a new email.
+						l_token := new_token
+						l_user_api.new_password (l_token, l_user.id)
+						l_url := req.absolute_script_url ("/account/reset-password?token=" + l_token)
+
+								-- Send Email
+						create es.make (create {CMS_AUTHENTICATION_EMAIL_SERVICE_PARAMETERS}.make (api))
+						write_debug_log (generator + ".handle register: send_contact_password_email")
+						es.send_contact_password_email (l_email, l_url)
+					else
+						r.values.force ("The username does not exist !", "error_username")
+						r.values.force (l_username.value, "username")
+						r.set_status_code ({HTTP_CONSTANTS}.bad_request)
+					end
 				end
 			end
 			r.execute
@@ -621,10 +639,12 @@ feature {NONE} -- Block views
 					end
 				end
 			elseif a_response.request.is_post_request_method then
-				if a_response.values.has ("error_email")  then
+				if a_response.values.has ("error_email") or else a_response.values.has ("error_username")   then
 					if attached template_block (a_block_id, a_response) as l_tpl_block then
 						l_tpl_block.set_value (a_response.values.item ("error_email"), "error_email")
 						l_tpl_block.set_value (a_response.values.item ("email"), "email")
+						l_tpl_block.set_value (a_response.values.item ("error_username"), "error_username")
+						l_tpl_block.set_value (a_response.values.item ("username"), "username")
 						a_response.add_block (l_tpl_block, "content")
 					else
 						debug ("cms")
diff --git a/modules/auth/site/templates/block_account_info.tpl b/modules/auth/site/templates/block_account_info.tpl
index debcd47..bc77b3e 100644
--- a/modules/auth/site/templates/block_account_info.tpl
+++ b/modules/auth/site/templates/block_account_info.tpl
@@ -1,5 +1,5 @@
  	<div class="primary-tabs">
-		{if isset="$user"}
+	 {if isset="$user"}
 		<h3>Account Information</h3>
 		<div>
 			<div>
@@ -16,7 +16,7 @@
 			   		<label>Last login:</label>  {$user.last_login_date/}
 			   	</div>	
 			   	<div>
-			   		<form method="get" action="{$site_url/}account/{$strategy/}">
+			   		<form method="get" action="{$site_url/}{$auth_login_strategy/}">
     					<button type="submit">Logout</button>
 					</form>
 			   	</div>	
@@ -57,6 +57,13 @@
 			   	</div>
     		{/foreach}
     	</div>		
-	
-		{/if}
+	{/if}
+	{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>
+		</div>	
+	{/unless}
 	</div>
diff --git a/modules/auth/site/templates/block_new_password.tpl b/modules/auth/site/templates/block_new_password.tpl
index ef5407f..b057d87 100644
--- a/modules/auth/site/templates/block_new_password.tpl
+++ b/modules/auth/site/templates/block_new_password.tpl
@@ -1,7 +1,7 @@
  <div>
-    <form action="/account/new-password" method="post">
+    <form action="{$site_url/}account/new-password" method="post">
         <fieldset>
-            <legend>Require new password</legend>
+            <legend>Require new password by email</legend>
             <div>
                 <input type="email" id="email" name="email"  value="{$email/}"  required/>
                 <label for="email">Email</label>
@@ -13,4 +13,20 @@
             <button type="submit">Send</button>
         </fieldset>    
     </form>
+    <hr>
+    <form action="{$site_url/}account/new-password" method="post">
+        <fieldset>
+            <legend>Require new password by username</legend>
+            <div>
+                <input type="text" id="username" name="username"  value="{$username/}"  required/>
+                <label for="username">Username</label>
+                {if isset="$error_username"}
+                    <span><i>{$error_username/}</i></span> <br>
+                {/if}
+                <br>
+            </div>
+            <button type="submit">Send</button>
+        </fieldset>    
+    </form>
+
 </div>
diff --git a/modules/auth/site/templates/block_reactivate.tpl b/modules/auth/site/templates/block_reactivate.tpl
index bef65c0..0146aa2 100644
--- a/modules/auth/site/templates/block_reactivate.tpl
+++ b/modules/auth/site/templates/block_reactivate.tpl
@@ -1,5 +1,5 @@
  <div>
-    <form action="/account/reactivate" method="post">
+    <form action="{$site_url/}account/reactivate" method="post">
         <fieldset>
             <legend>Reactivate Form</legend>
             <div>
diff --git a/modules/auth/site/templates/block_register.tpl b/modules/auth/site/templates/block_register.tpl
index 58a4872..9e7c478 100644
--- a/modules/auth/site/templates/block_register.tpl
+++ b/modules/auth/site/templates/block_register.tpl
@@ -1,5 +1,5 @@
  <div>
-    <form action="/account/roc-register" method="post">
+    <form action="{$site_url/}account/roc-register" method="post">
         <fieldset>
             <legend>Register Form</legend>
             <div>
diff --git a/modules/auth/site/templates/block_reset_password.tpl b/modules/auth/site/templates/block_reset_password.tpl
index b99289d..0101587 100644
--- a/modules/auth/site/templates/block_reset_password.tpl
+++ b/modules/auth/site/templates/block_reset_password.tpl
@@ -1,5 +1,5 @@
  <div>
-    <form action="/account/reset-password" method="post">
+    <form action="{$site_url/}account/reset-password" method="post">
         <fieldset>
             <legend>Generate New Password Form</legend>
             <div>
diff --git a/modules/basic_auth/cms_basic_auth_module.e b/modules/basic_auth/cms_basic_auth_module.e
index 0034610..62d91c0 100644
--- a/modules/basic_auth/cms_basic_auth_module.e
+++ b/modules/basic_auth/cms_basic_auth_module.e
@@ -115,9 +115,8 @@ feature -- Hooks
 			-- <Precursor>
 		do
 			if attached current_user (a_response.request) as l_user then
-				a_value.force (l_user, "user")
+				a_value.force ("basic_auth_logoff", "auth_login_strategy")
 			end
-			a_value.force ("basic_auth_logoff", "strategy")
 		end
 
 	menu_system_alter (a_menu_system: CMS_MENU_SYSTEM; a_response: CMS_RESPONSE)
diff --git a/modules/oauth20/cms_oauth_20_module.e b/modules/oauth20/cms_oauth_20_module.e
index f2df195..9f7b97a 100644
--- a/modules/oauth20/cms_oauth_20_module.e
+++ b/modules/oauth20/cms_oauth_20_module.e
@@ -199,10 +199,12 @@ feature -- Hooks
 	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")
+			if
+				attached a_response.current_user (a_response.request) as u and then
+				attached {WSF_STRING} a_response.request.cookie ({CMS_OAUTH_20_CONSTANTS}.oauth_session)
+			then
+				a_value.force ("account/roc-oauth-logout", "auth_login_strategy")
 			end
-			a_value.force ("roc-oauth-logout", "strategy")
 		end
 
 	menu_system_alter (a_menu_system: CMS_MENU_SYSTEM; a_response: CMS_RESPONSE)
diff --git a/modules/openid/cms_openid_module.e b/modules/openid/cms_openid_module.e
index 6ca1c2c..d9b8dd6 100644
--- a/modules/openid/cms_openid_module.e
+++ b/modules/openid/cms_openid_module.e
@@ -179,10 +179,12 @@ feature -- Hooks
 	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")
+			if
+				attached a_response.current_user (a_response.request) as u and then
+				attached {WSF_STRING} a_response.request.cookie ({CMS_OPENID_CONSTANTS}.openid_session) 
+			then
+				a_value.force ("account/roc-openid-logout", "auth_login_strategy")
 			end
-			a_value.force ("roc-openid-logout", "strategy")
 		end
 
 	menu_system_alter (a_menu_system: CMS_MENU_SYSTEM; a_response: CMS_RESPONSE)