--- a/sdi/forms.py	Mon Jun 07 16:00:42 2010 +0530
+++ b/sdi/forms.py	Mon Jun 07 16:49:31 2010 +0530
@@ -157,12 +157,13 @@
 
     def clean_username(self):
         username = self.cleaned_data['username']
-        password = self.clean_password()
+        try:
+            password = self.data['password']
+        except KeyError:
+            raise forms.ValidationError("Invalid username or password")
 
         if not authenticate(username=username, password=password):
             raise forms.ValidationError("Invalid username or password")
 
         return username
 
-    def clean_password(self):
-        return self.cleaned_data['password']