diff --git a/app/scripts/templates/sign_in.mustache b/app/scripts/templates/sign_in.mustache
index e1d47d0ae8..6fe52d84c2 100644
--- a/app/scripts/templates/sign_in.mustache
+++ b/app/scripts/templates/sign_in.mustache
@@ -45,17 +45,23 @@
               <button id="submit-btn" type="submit" class="disabled">{{#t}}Sign in{{/t}}</button>
             </div>
            </form>
+
+           <div class="links">
+             <a href="/reset_password" class="left reset-password">{{#t}}Forgot password?{{/t}}</a>
+             <a href="/#" class="right use-different">{{#t}}Use a different account{{/t}}</a><br/>
+           </div>
         {{/chooserAskForPassword}}
 
         {{^chooserAskForPassword}}
           <div class="button-row">
             <button type="submit" class="use-logged-in">{{#t}}Sign in{{/t}}</button>
           </div>
+
+          <div class="links">
+            <a href="/#" class="use-different">{{#t}}Use a different account{{/t}}</a><br/>
+          </div>
         {{/chooserAskForPassword}}
 
-        <div class="links">
-          <a href="/#" class="use-different">{{#t}}Use a different account{{/t}}</a><br/>
-        </div>
 
       {{/suggestedUser}}