diff --git a/bam/templates/login.html b/bam/templates/login.html
index 6c7e0ef7807a1bb67c1d626ac2374dac2dba624e..b055230a4d9646fd5b98b13680bd41362f5ec16d 100644
--- a/bam/templates/login.html
+++ b/bam/templates/login.html
@@ -8,10 +8,8 @@
     {% with messages = get_flashed_messages(with_categories=True) %} {% if
     messages %} {% for category, message in messages %}
     <div class="f-message f-message-{{ category }}">{{ message }}</div>
-    {% endfor %} {% endif %} {% endwith %}
-    <!-- <div>Your account has been successfully created.</div> -->
-    {{ form.email.label() }} {{ form.email(class="field") }} {% for error in
-    form.email.errors %}
+    {% endfor %} {% endif %} {% endwith %} {{ form.email.label() }} {{
+    form.email(class="field") }} {% for error in form.email.errors %}
     <div class="field-error">{{ error }}</div>
     {% endfor %} {{ form.password.label() }} {{ form.password(class="field") }}
     {% for error in form.password.errors %}
diff --git a/bam/templates/register.html b/bam/templates/register.html
index b66522c09c2d72626d9b6dbbfe69109554b102f5..484ff8e9c92082f558374111b16d805f14ad9e06 100644
--- a/bam/templates/register.html
+++ b/bam/templates/register.html
@@ -5,8 +5,11 @@
   <form action="" method="POST">
     {{ form.hidden_tag() }}
     <h1>Create an account</h1>
-    {{ form.email.label() }} {{ form.email(class="field") }} {% for error in
-    form.email.errors %}
+    {% with messages = get_flashed_messages(with_categories=True) %} {% if
+    messages %} {% for category, message in messages %}
+    <div class="f-message f-message-{{ category }}">{{ message }}</div>
+    {% endfor %} {% endif %} {% endwith %} {{ form.email.label() }} {{
+    form.email(class="field") }} {% for error in form.email.errors %}
     <div class="field-error">{{ error }}</div>
     {% endfor %} {{ form.password.label() }} {{ form.password(class="field") }}
     {% for error in form.password.errors %}
@@ -15,8 +18,7 @@
     form.confirm_password(class="field") }} {% for error in
     form.confirm_password.errors %}
     <div class="field-error">{{ error }}</div>
-    {% endfor %}
-    <input type="submit" value="Sign in" />
+    {% endfor %} {{ form.submit() }}
   </form>
 </div>
 {% endblock content %}