diff --git a/docs/authentication.txt b/docs/authentication.txt
index d0df43d6a8..aacf21c106 100644
--- a/docs/authentication.txt
+++ b/docs/authentication.txt
@@ -541,14 +541,14 @@ block::
 
     {% block content %}
 
-    {% if form.has_errors %}
+    {% if form.errors %}
     <p>Your username and password didn't match. Please try again.</p>
     {% endif %}
 
     <form method="post" action=".">
     <table>
-    <tr><td><label for="id_username">Username:</label></td><td>{{ form.username }}</td></tr>
-    <tr><td><label for="id_password">Password:</label></td><td>{{ form.password }}</td></tr>
+    <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>
 
     <input type="submit" value="login" />