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

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

diff --cc snf-astakos-app/astakos/im/forms.py
index 2e136ae,d22a985..8f22a15
--- 1/snf-astakos-app/astakos/im/forms.py
--- 2/snf-astakos-app/astakos/im/forms.py
+++ b/snf-astakos-app/astakos/im/forms.py
@@@ -319,10 -320,10 +320,10 @@@ class LoginForm(AuthenticationForm)
          check = captcha.submit(rcf, rrf, RECAPTCHA_PRIVATE_KEY, self.ip)
          if not check.is_valid:
              raise forms.ValidationError(_('You have not entered the correct words'))
-     
+ 
      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