diff --git a/Changelog b/Changelog
index 37c4e465e..099e4d22b 100755
--- a/Changelog
+++ b/Changelog
@@ -1,3 +1,5 @@
+2015-12-17 DariusIII
+	Fix: Add forgotten password link to Gamma, fix forgottenpassword page
 2015-12-16 DariusIII
 	Upd: Update the newznab/db/populate/AniDB class.
 	Add: Add full XXX movie view to all the templates
diff --git a/www/themes/Gamma/templates/frontend/forgottenpassword.tpl b/www/themes/Gamma/templates/frontend/forgottenpassword.tpl
index 5cee255d3..fd596e4f0 100755
--- a/www/themes/Gamma/templates/frontend/forgottenpassword.tpl
+++ b/www/themes/Gamma/templates/frontend/forgottenpassword.tpl
@@ -1,27 +1,27 @@
-<div class="span6 offset2" 
+<div class="span6 offset2"
 style="
-background-color:#d9edf7; 
+background-color:#d9edf7;
 padding:40px;
 background-color: #f7f7f9;
 border: 1px solid #e1e1e8;
   -webkit-border-radius: 4px;
      -moz-border-radius: 4px;
           border-radius: 4px;
-"> 
+">
 	<h1>{$page->title}</h1>
 
 	<p>
 		Please enter the email address you used to register and we will send an email to reset your password. If you cannot remember your email, or no longer have access to it, please <a href="{$smarty.const.WWW_TOP}/contact-us">contact us</a>.
 	</p>
-	
-	{if $confirmed == '' && $sent == ''}
-	
+
+	{if isset($confirmed) && $confirmed == '' && isset($sent) && $sent == ''}
+
 	<p>
 		<form class="form-horizontal" action="forgottenpassword?action=submit" method="post">
 			<table class="data">
 			<input type="hidden" name="redirect" value="{$redirect|escape:"htmlall"}" />
 
-			{if $error != ''}
+			{if isset($error) && $error != ''}
 				<div class="alert alert-error">
 					<button type="button" class="close" data-dismiss="alert">&times;</button>
 					  <h4>Error!</h4>
@@ -45,6 +45,6 @@ border: 1px solid #e1e1e8;
 			<h4>Success!</h4>
 			Your password has been reset and sent to you in an email.
 		</div>
-	{/if}	
-	
+	{/if}
+
 </div>
diff --git a/www/themes/Gamma/templates/frontend/login.tpl b/www/themes/Gamma/templates/frontend/login.tpl
index 5ce90717f..4ac702af2 100755
--- a/www/themes/Gamma/templates/frontend/login.tpl
+++ b/www/themes/Gamma/templates/frontend/login.tpl
@@ -17,6 +17,7 @@
 		<input class="span12" id="password" name="password" type="password" placeholder="Password" style="margin-bottom:20px;"><br />
 
 		<input id="rememberme" {if $rememberme == 1}checked="checked"{/if} name="rememberme" type="checkbox"/> <span class="help-inline" style="vertical-align:sub;">Remember me </span>
+			<div class="pull-right"><a href="{$serverroot}forgottenpassword" class="text-center">I forgot my password</a></div>
 			<p>
 			{$page->smarty->fetch('captcha.tpl')}
 			</p>