diff --git a/templates/registration/login.html b/templates/registration/login.html
index 46feab6..9e700b3 100644
--- a/templates/registration/login.html
+++ b/templates/registration/login.html
@@ -38,17 +38,7 @@
 
 <form action="{% url 'login' %}" method="post">
 	{% csrf_token %}
-	<table>
-		<tr>
-			<td>{{ form.username.label_tag }}</td>
-			<td>{{ form.username }}</td>
-		</tr>
-		<tr>
-			<td>{{ form.password.label_tag }}</td>
-			<td>{{ form.password }}</td>
-		</tr>
-	</table>
-
+	{{ form.as_div }}
 	<input type="submit" value="Login">
 	<input type="hidden" name="next" value="{{ next }}">
 </form>
diff --git a/templates/registration/new-user.html b/templates/registration/new-user.html
index b4ee832..30ab8c7 100644
--- a/templates/registration/new-user.html
+++ b/templates/registration/new-user.html
@@ -34,28 +34,7 @@
 
 	<form method="post" action="{% url 'new-user' %}">
 		{% csrf_token %}
-		<table>
-			<tr>
-				<td>{{ form.username.label_tag }}</td>
-				<td>{{ form.username }}</td>
-			</tr>
-			<tr>
-				<td>{{ form.first_name.label_tag }}</td>
-				<td>{{ form.first_name }}</td>
-			</tr>
-			<tr>
-				<td>{{ form.last_name.label_tag }}</td>
-				<td>{{ form.last_name }}</td>
-			</tr>
-			<tr>
-				<td>{{ form.password1.label_tag }}</td>
-				<td>{{ form.password1 }}</td>
-			</tr>
-			<tr>
-				<td>{{ form.password2.label_tag }}</td>
-				<td>{{ form.password2 }}</td>
-			</tr>
-		</table>
+		{{ form.as_div }}
 		<input type="submit" value="Create account">
 	</form>
 {% endblock %}