# HG changeset patch
# User dellsystem <ilostwaldo@gmail.com>
# Date 1350706792 14400
# Node ID 9565b494b989347b959eabfc4b9f4844ea27f3db
# Parent  c494e6ecff586962c5044942a09a572bd1dd6faa# Parent  d31b236ed5cfd81ec71fe51760a62a017a61968d
Merge Jordi's changes

diff -r d31b236ed5cf -r 9565b494b989 views.py
--- a/views.py	Wed Oct 17 10:33:03 2012 -0400
+++ b/views.py	Sat Oct 20 00:19:52 2012 -0400
@@ -33,9 +33,17 @@
 
             if username and password:
                 user = authenticate(username=username, password=password)
-                login(request, user)
+
+                if user is not None:
+                    login(request, user)
+                    return redirect(next_url)
 
-                return redirect(next_url)
+                # Could not authenticate
+                form = {
+                    'username': {
+                        'errors': 'Your username and password did not match.',
+                    }
+                }
             else:
                 form = {
                     'password1': {