diff --git a/rest_framework/templates/rest_framework/login_base.html b/rest_framework/templates/rest_framework/login_base.html
index 75e6d4727..3a75e8b35 100644
--- a/rest_framework/templates/rest_framework/login_base.html
+++ b/rest_framework/templates/rest_framework/login_base.html
@@ -18,38 +18,38 @@
                     <div class="row-fluid">
                         <div>
                             <form action="{% url 'rest_framework:login' %}" class=" form-inline" method="post">
-                                {% if form.non_field_errors %}
-                                    {% for error in form.non_field_errors %}
-                                        <p class="alert">{{ error }}</p>
-                                    {% endfor %}
-                                {% endif %}
                                 {% csrf_token %}
                                 <div id="div_id_username" class="clearfix control-group">
                                     <div class="controls">
+                                        <Label class="span4">Username:</label>
+                                        <input style="height: 25px" type="text" name="username" maxlength="100" autocapitalize="off" autocorrect="off" class="textinput textInput" id="id_username" required>
                                         {% if form.username.errors %}
-                                            <p class="alert">
+                                            <p class="alert" style="margin-top: 10px">
                                                 {{ form.username.errors|striptags }}
                                             </p>
                                         {% endif %}
-                                        <Label class="span4">Username:</label>
-                                        <input style="height: 25px" type="text" name="username" maxlength="100" autocapitalize="off" autocorrect="off" class="textinput textInput" id="id_username" required>
                                     </div>
                                 </div>
                                 <div id="div_id_password" class="clearfix control-group">
                                         <div class="controls">
+                                        <Label class="span4">Password:</label>
+                                        <input style="height: 25px" type="password" name="password" maxlength="100" autocapitalize="off" autocorrect="off" class="textinput textInput" id="id_password" required>
                                         {% if form.password.errors %}
-                                            <p class="alert">
+                                            <p class="alert" style="margin-top: 10px">
                                                 {{ form.password.errors|striptags }}
                                             </p>
                                         {% endif %}
-                                        <Label class="span4">Password:</label>
-                                        <input style="height: 25px" type="password" name="password" maxlength="100" autocapitalize="off" autocorrect="off" class="textinput textInput" id="id_password" required>
                                     </div>
                                 </div>
                                 <input type="hidden" name="next" value="{{ next }}" />
                                 <div class="form-actions-no-box">
                                     <input type="submit" name="submit" value="Log in" class="btn btn-primary" id="submit-id-submit">
                                 </div>
+                                {% if form.non_field_errors %}
+                                    {% for error in form.non_field_errors %}
+                                        <div class="alert" style="margin-top: 10px">{{ error }}</div>
+                                    {% endfor %}
+                                {% endif %}
                             </form>
                         </div>
                     </div><!-- /.row-fluid -->