diff --git a/app/templates/login.html b/app/templates/login.html
index 3a67b0b..01765ab 100644
--- a/app/templates/login.html
+++ b/app/templates/login.html
@@ -3,19 +3,31 @@
 {% block content %}
     <h1>Login</h1>
     <form action="" method="post">
-        {{ form.hidden_tag() }}
-        {% for field in form %}
-            <p>
-                {{ field.label }}<br>
-                {{ field() }}
-                {% if field.errors %}
-                    <ul class=errors>
-                        {% for category, message in messages %}
-                            <li class="{{ category }}">{{ message }}</li>
-                        {% endfor %}
-                    </ul>
-                {% endif %}
-            </p>
-        {% endfor %}
+        {{ form.csrf_token() }}
+        <p>
+            {{ form.username.label }}<br>
+            {{ form.username() }}
+            {% if form.username.errors %}
+                <ul class="errors">
+                    {% for error in form.username.errors %}
+                        <li class="danger">{{ error }}</li>
+                    {% endfor %}
+                </ul>
+            {% endif %}
+        </p>
+        <p>
+            {{ form.password.label }}<br>
+            {{ form.password() }}
+            {% if form.password.errors %}
+                <ul class="errors">
+                    {% for error in form.password.errors %}
+                        <li class="danger">{{ error }}</li>
+                    {% endfor %}
+                </ul>
+            {% endif %}
+        </p>
+        <p>
+            <input type="submit" value="Login">
+        </p>
     </form>
 {% endblock %}
\ No newline at end of file
diff --git a/app/templates/register.html b/app/templates/register.html
index bb475d8..5820612 100644
--- a/app/templates/register.html
+++ b/app/templates/register.html
@@ -3,19 +3,54 @@
 {% block content %}
     <h1>Register</h1>
     <form action="" method="post">
-        {{ form.hidden_tag() }}
-        {% for field in form %}
-            <p>
-                {{ field.label }}<br>
-                {{ field() }}
-                {% if field.errors %}
-                    <ul class=errors>
-                    {% for error in field.errors %}
-                        <li>{{ error }}</li>
+        {{ form.csrf_token }}
+        <p>
+            {{ form.username.label }}
+            {{ form.username() }}
+            {% if form.username.errors %}
+                <ul class="errors">
+                    {% for error in form.username.errors %}
+                        <li class="danger">{{ error }}</li>
                     {% endfor %}
-                    </ul>
-                {% endif %}
-            </p>
-        {% endfor %}
+                </ul>
+            {% endif %}
+        </p>
+        <p>
+            {{ form.password.label }}
+            {{ form.password() }}
+            {% if form.password.errors %}
+            <ul class="errors">
+                {% for error in form.password.errors %}
+                    <li class="danger">{{ error }}</li>
+                {% endfor %}
+            </ul>
+            {% endif %}
+        </p>
+        <p>
+            {{ form.password2.label }}
+            {{ form.password2() }}
+            {% if form.password2.errors %}
+            <ul class="errors">
+                {% for error in form.password2.errors %}
+                    <li class="danger">{{ error }}</li>
+                {% endfor %}
+            </ul>
+            {% endif %}
+        </p>
+        <p>
+            {{ form.tnc.label }}
+            {{ form.tnc() }}
+            {% if form.tnc.errors %}
+            <ul class="errors">
+                {% for error in form.tnc.errors %}
+                    <li class="danger">{{ error }}</li>
+                {% endfor %}
+            </ul>
+            {% endif %}
+        </p>
+
+        <p>
+            <input type="submit" value="Register">
+        </p>
     </form>
 {% endblock %}
\ No newline at end of file