diff --git a/roles/ipsilon/files/templates/layout.html b/roles/ipsilon/files/templates/layout.html
index 8630b12108..43860748cd 100644
--- a/roles/ipsilon/files/templates/layout.html
+++ b/roles/ipsilon/files/templates/layout.html
@@ -49,6 +49,7 @@
                                         {% block main %}{% endblock %}
                                     </div>
                                 </div>
+                                {% block after_card %}{% endblock %}
                             </div>
                         </div>
                     </div>
diff --git a/roles/ipsilon/files/templates/login/form.html b/roles/ipsilon/files/templates/login/form.html
index c7149dfe3c..119e27b84e 100644
--- a/roles/ipsilon/files/templates/login/form.html
+++ b/roles/ipsilon/files/templates/login/form.html
@@ -8,7 +8,7 @@
 {% endblock %}
 {% block cardwidths %}col-md-6 col-md-offset-3 col-sm-8 col-sm-offset-2{% endblock %}
 {% block maintitle %}
-    login with FAS
+    Log in with FAS
 {% endblock %}
 {% block main %}
                 {% if error %}<p>{{error}}</p>{% endif %}
@@ -19,17 +19,24 @@
                             <input class="form-control" id="username" name="login_name" placeholder="Username" autofocus value="{{ username | e }}" />
                         </div>
                     </div>
-                    <div class="form-group row">
+                    <div class="form-group row m-b-0">
                         <div class="col-xs-12">
                             <input class="form-control" id="password" name="login_password" type="password" placeholder="Password" />
                         </div>
+                        <div class="col-xs-12 text-xs-right">
+                            <small class="text-muted"><a target="_blank" href="https://admin.fedoraproject.org/accounts/user/resetpass">Forgot password?</a></small>
+                        </div>
                     </div>
                     <div class="form-group row m-b-0">
                         <div class="col-xs-12">
                             <input class="btn btn-primary" type="submit" id="loginbutton" value="Log in" />
-                            <span class="btn btn-link small"><small><a target="_blank" href="https://admin.fedoraproject.org/accounts/user/new">create a FAS account</a></small></span>
                         </div>
                     </div>
                 </form>
 {% endblock %}
 
+{% block after_card %}
+
+<div class="text-xs-center"><small class="text-muted">Don't have a FAS account? <a target="_blank" href="https://admin.fedoraproject.org/accounts/user/new">Sign up now</a>.</small></div>
+
+{% endblock %}