diff --git a/sourcing/templates/form/simple.html b/sourcing/templates/form/simple.html
index cfa6139..9b168cd 100644
--- a/sourcing/templates/form/simple.html
+++ b/sourcing/templates/form/simple.html
@@ -1,8 +1,6 @@
 {% extends "base.html" %}
 
 {% block content %}
-  <h1 class="mt-3">{{ self.title() }}</h1>
-  {% block form %}
-    {% include "form/main.html" %}
-  {% endblock %}
+  <h1>{{ self.title() }}</h1>
+  {% include "form/main.html" %}
 {% endblock %}
diff --git a/sourcing/templates/login.html b/sourcing/templates/login.html
index da1f3d4..2c49088 100644
--- a/sourcing/templates/login.html
+++ b/sourcing/templates/login.html
@@ -1,7 +1,9 @@
-{% extends "form/simple.html" %}
+{% extends "base.html" %}
 {% from "form/controls.html" import render_field, checkbox, submit %}
 
 {% block title %}Login{% endblock %}
+
+{% block content %}
 {% set action=url_for('.login') %}
 {% set label="Sign in" %}
 
@@ -18,3 +20,7 @@
     <a href="{{ url_for('.password_reset') }}">forgotten your password?</a>
 </div>
 {% endset %}
+
+  <h1>{{ self.title() }}</h1>
+  {% include "form/main.html" %}
+{% endblock %}
diff --git a/sourcing/templates/signup.html b/sourcing/templates/signup.html
index c26cf02..9bb9b94 100644
--- a/sourcing/templates/signup.html
+++ b/sourcing/templates/signup.html
@@ -1,13 +1,18 @@
-{% extends "form/simple.html" %}
+{% extends "base.html" %}
 {% from "form/controls.html" import render_field %}
 
 {% block title %}Sign up{% endblock %}
 
-{% set action=url_for('.signup') %}
-{% set label="Sign up" %}
+{% block content %}
+  {% set action=url_for('.signup') %}
+  {% set label="Sign up" %}
 
-{% set fields %}
-{{ render_field(form.username) }}
-{{ render_field(form.password) }}
-{{ render_field(form.email) }}
-{% endset %}
+  {% set fields %}
+  {{ render_field(form.username) }}
+  {{ render_field(form.password) }}
+  {{ render_field(form.email) }}
+  {% endset %}
+
+  <h1>{{ self.title() }}</h1>
+  {% include "form/main.html" %}
+{% endblock %}