diff --git a/rhodecode/templates/password_reset.html b/rhodecode/templates/password_reset.html
--- a/rhodecode/templates/password_reset.html
+++ b/rhodecode/templates/password_reset.html
@@ -2,13 +2,34 @@
 <%inherit file="base/root.html"/>
 
 <%def name="title()">
-    ${_('Password Reset')} &middot; ${c.rhodecode_name}
+    ${_('Password Reset')}
+    %if c.rhodecode_name:
+        &middot; ${c.rhodecode_name}
+    %endif
 </%def>
 
+
+<div id="header">
+    <div id="header-inner" class="title">
+        <div id="logo">
+            <div class="header">
+                <a href="${h.url('home')}"><img src="/images/rhodecode-logo-white-216x60.png" alt="RhodeCode"/></a>
+            </div>
+            %if c.rhodecode_name:
+             <div class="branding">- ${c.rhodecode_name}</div>
+            %endif
+        </div>
+    </div>
+</div>
+
 <div id="register">
-
-    <div class="title top-left-rounded-corner top-right-rounded-corner">
-        <h5>${_('Reset your password to')} ${c.rhodecode_name}</h5>
+    <%include file="/base/flash_msg.html"/>
+    <div class="title withlogo">
+        %if c.rhodecode_name:
+            <h5>${_('Reset your Password to %s') % c.rhodecode_name}</h5>
+        %else:
+            <h5>${_('Reset your Password')}</h5>
+        %endif
     </div>
     <div class="inner">
         ${h.form(url('password_reset'))}
@@ -18,26 +39,48 @@
 
                  <div class="field">
                     <div class="label">
-                        <label for="email">${_('Email address')}:</label>
+                        <label for="email">${_('Email Address')}:</label>
                     </div>
                     <div class="input">
                         ${h.text('email')}
                     </div>
                  </div>
 
+                %if c.captcha_active:
+                <div class="field">
+                    <div class="label">
+                        <label for="email">${_('Captcha')}:</label>
+                    </div>
+                    <div class="input">
+                        ${h.hidden('recaptcha_field')}
+                        <div id="recaptcha"></div>
+                    </div>
+                </div>
+                %endif
+
                 <div class="buttons">
                     <div class="nohighlight">
-                      ${h.submit('send',_('Reset my password'),class_="ui-btn large")}
+                      ${h.submit('send',_('Send password reset email'),class_="btn")}
                           <div class="activation_msg">${_('Password reset link will be send to matching email address')}</div>
                     </div>
                 </div>
             </div>
         </div>
         ${h.end_form()}
+        %if c.captcha_active:
+        <script type="text/javascript" src="https://www.google.com/recaptcha/api/js/recaptcha_ajax.js"></script>
+        %endif
         <script type="text/javascript">
-        YUE.onDOMReady(function(){
-            YUD.get('email').focus();
-        })
+         $(document).ready(function(){
+            $('#email').focus();
+            %if c.captcha_active:
+            Recaptcha.create("${c.captcha_public_key}", "recaptcha",
+                {
+                  theme: "white",
+                }
+            );
+            %endif
+         });
         </script>
     </div>
    </div>