Merge branch 'master' of https://code.grnet.gr/git/astakos

Conflicts:
	snf-astakos-app/astakos/im/forms.py

diff --git a/snf-astakos-app/astakos/im/forms.py b/snf-astakos-app/astakos/im/forms.py
index d22a985..8f22a15 100644 (file)
--- a/snf-astakos-app/astakos/im/forms.py
+++ b/snf-astakos-app/astakos/im/forms.py
@@ -323,7 +323,7 @@ class LoginForm(AuthenticationForm):
 
     def clean(self):
         super(LoginForm, self).clean()
-        if self.user_cache.provider != 'local':
+        if self.user_cache and self.user_cache.provider not in ('local', ''):
             raise forms.ValidationError(_('Local login is not the current authentication method for this account.'))
         return self.cleaned_data