diff --git a/code/ryzom/client/src/client_cfg.cpp b/code/ryzom/client/src/client_cfg.cpp
index b06495c44..930badab9 100644
--- a/code/ryzom/client/src/client_cfg.cpp
+++ b/code/ryzom/client/src/client_cfg.cpp
@@ -327,7 +327,7 @@ CClientConfig::CClientConfig()
 	ConditionsTermsURL	= "https://secure.ryzom.com/signup/terms_of_use.php";
 	EditAccountURL		= "http://shard.ryzomcore.org/ams/index.php?page=settings";
 	BetaAccountURL		= "http://www.ryzom.com/profile";
-	ForgetPwdURL		= "https://secure.ryzom.com/payment_profile/lost_secure_password.php";
+	ForgetPwdURL		= "http://shard.ryzomcore.org/ams/index.php?page=forgot_password";
 	FreeTrialURL		= "http://www.ryzom.com/join/?freetrial=1";
 	LoginSupportURL		= "http://shard.ryzomcore.org/ams/index.php";
 	Position			= CVector(0.f, 0.f, 0.f);	// Default Position.
diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/translations/en.ini b/code/ryzom/tools/server/ryzom_ams/ams_lib/translations/en.ini
index 4c8f45b3a..8f1f9379b 100644
--- a/code/ryzom/tools/server/ryzom_ams/ams_lib/translations/en.ini
+++ b/code/ryzom/tools/server/ryzom_ams/ams_lib/translations/en.ini
@@ -16,6 +16,9 @@ email_tooltip = "The emailaddress related to the account of which you forgot the
 email_default = "Email"
 email_doesnt_exist = "That emailaddress doesn't match any user!"
 email_sent = "An email with further instructions has been sent to the emailaddress!"
+register_message ="<strong>Register</strong> If you don't have an account yet, create one "
+here = "here"
+login_message = "You can always try to login by clicking "
 
 [reset_password]
 title = "Reset your password"
diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/translations/fr.ini b/code/ryzom/tools/server/ryzom_ams/ams_lib/translations/fr.ini
index da25a0194..b4fa1fcf6 100644
--- a/code/ryzom/tools/server/ryzom_ams/ams_lib/translations/fr.ini
+++ b/code/ryzom/tools/server/ryzom_ams/ams_lib/translations/fr.ini
@@ -15,6 +15,9 @@ email_tooltip = "le emailaddress liee au compte dont vous avez oublie le mot de
 email_default = "Email"
 email_doesnt_exist = "C'est emailaddress ne correspond pas a n'importe quel utilisateur!"
 email_sent = "Un e-mail avec des instructions a ete envoye a l'adresse email!"
+register_message ="<strong> Inscrivez-vous </strong> Si vous n'avez pas encore de compte, creez-en un "
+here = "ici"
+login_message = "vous pouvez toujours fait au bon chance a "
 
 [reset_password]
 title = "reset votre email"
diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/templates/forgot_password.tpl b/code/ryzom/tools/server/ryzom_ams/www/html/templates/forgot_password.tpl
index d55b94a85..9b080d42a 100644
--- a/code/ryzom/tools/server/ryzom_ams/www/html/templates/forgot_password.tpl
+++ b/code/ryzom/tools/server/ryzom_ams/www/html/templates/forgot_password.tpl
@@ -37,16 +37,15 @@
 				{$email_sent}
 			</div>
 			{/if}
-			<input type="hidden" name="function" value="forgot_password">
-			<div class="control-group">
-				<label class="control-label"></label>			
-				<div class="controls">
-					<button type="submit" class="btn btn-large btn-primary" >Send me the reset link</button>	
-				</div>
-			</div>
+			<input type="hidden" name="function" value="forgot_password">		
+			<p class="center span5">
+				<button type="submit" class="btn btn-primary" >Send me the reset link</button>
+			</p>
 	
 		</form>
-
+		<div class="alert alert-info">
+			{$register_message} <a href="?page=register">{$here}</a>.<br/> {$login_message} <a href="?page=login">{$here}</a>
+		</div>
 
 	</div><!--/span-->
 </div><!--/row-->
diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/templates/register.tpl b/code/ryzom/tools/server/ryzom_ams/www/html/templates/register.tpl
index 765153d9b..44d81f9c7 100644
--- a/code/ryzom/tools/server/ryzom_ams/www/html/templates/register.tpl
+++ b/code/ryzom/tools/server/ryzom_ams/www/html/templates/register.tpl
@@ -106,17 +106,9 @@
 			{/if}
 			
 			<input type="hidden" name="function" value="add_user">
-			<div class="control-group">
-			<label class="control-label"></label>
-		      <div class="controls">
-		       <button type="submit" class="btn btn-large btn-primary" >Create My Account</button>
-	
-		      </div>
-		       
-			
-		 
-
-		</div>
+			<p class="center span5">
+				<button type="submit" class="btn btn-primary" >Create My Account</button>
+			</p>
 	
 		</form>