--- htdocs/css/common.css	(revision 557)
+++ htdocs/css/common.css	(working copy)
@@ -200,6 +200,7 @@
 
 .box h1.title {
   background: #a2bedc url('/images/box_top_bg.png') repeat-x top left;
+  border-bottom: 1px #728eac solid;
   font-size: 120%;
   margin: 0;
   padding: 5px 10px;
@@ -255,6 +256,18 @@
   display: inline;
 }
 
+
+/****************************************************************************
+ * Log In Form
+ ****************************************************************************/
+BLABLUB
+  padding: 4px;
+}
+
+
+/****************************************************************************
+ * Account page
+ ****************************************************************************/
 .prefsbuttons {
   padding: 8px;
   background-color: #B6CCE3;
--- templates/accounts/login.html	(revision 550)
+++ templates/accounts/login.html	(working copy)
@@ -3,30 +3,48 @@
 {% block title %}Log in{% endblock %}
 
 {% block content %}
-<div class="section">
- <h1>Log in</h1>
- <div class="body">
-  {% if error %}
-  {%  errorbox %}
-  {{ error }}
-  {%  enderrorbox %}
-  {% endif %}
-  <form method="post" action=".">
-   <table id="login_form">
-    <tr>
-     <td class="label"><label for="id_username">Username:</label></td>
-     <td class="field"><input type="text" name="username" id="id_username" /></td>
-    </tr>
-    <tr>
-     <td class="label"><label for="id_password">Password:</label></td>
-     <td class="field"><input type="password" name="password" id="id_password" /></td>
-    </tr>
-    <tr>
-     <td>&nbsp;</td>
-     <td class="field"><input type="submit" value="Log in" /></td>
-    </tr>
-   </table>
-  </form>
+{% box important %}
+{% if BUILTIN_AUTH %}
+ <h1>New user?</h1>
+ <p>
+  If you don't yet have an account, you'll need to
+  <a href="/account/register/">register</a> one. It will only take a
+  minute.
+ </p>
+{% else %}
+ <h1>Log in with your standard username and password</h1>
+ <p>
+  There's no need to register a new account. Your standard username and
+  password should work fine.
+ </p>
+{% endif %}
+{% endbox %}
+
+{% box loginform %}
+<form method="post" action=".">
+ <h1 class="title">Log In</h1>
+ <div class="main">
+ {% if error %}
+ {%  errorbox %}
+ {{ error }}
+ {%  enderrorbox %}
+ {% endif %}
+ <table>
+  <tr>
+   <td class="label"><label for="id_username">Username:</label></td>
+   <td class="field"><input type="text" name="username" id="id_username" /></td>
+  </tr>
+  <tr>
+   <td class="label"><label for="id_password">Password:</label></td>
+   <td class="field"><input type="password" name="password" id="id_password" /></td>
+  </tr>
+  <tr>
+   <td>&nbsp;</td>
+   <td class="field"><input type="submit" value="Log in" /></td>
+  </tr>
+ </table>
  </div>
-</div>
+</form>
+{% endbox %}
+
 {% endblock %}
--- urls.py	(revision 550)
+++ urls.py	(working copy)
@@ -114,7 +114,8 @@
 
     # Authentication and accounts
     (r'^account/login/$', 'djblets.auth.views.login',
-     {'next_page': '/dashboard/'}),
+     {'next_page': '/dashboard/',
+      'extra_context': {'BUILTIN_AUTH': settings.BUILTIN_AUTH}}),
     (r'^account/logout/$', 'django.contrib.auth.views.logout',
      {'next_page': settings.LOGIN_URL}),
     (r'^account/preferences/$', 'reviewboard.accounts.views.user_preferences',),
@@ -125,6 +126,11 @@
         (r'^account/register/$', 'djblets.auth.views.register',
          {'next_page': '/dashboard/'}),
     )
+else:
+    urlpatterns += patterns('',
+        (r'^account/register/$',
+         'django.views.generic.simple.redirect_to',
+         {'url': '/account/login/'}))
 
 # Add static media if running in DEBUG mode
 if settings.DEBUG: