X-Git-Url: https://git.mdrn.pl/django-cas-provider.git/blobdiff_plain/7000b91d56bf8528a8a613f7b07f4307d89dffe7..36da57ccf1745c118c112fe457a173293e74ad36:/cas_provider/views.py

diff --git a/cas_provider/views.py b/cas_provider/views.py
index 5d9ea38..526a100 100644
--- a/cas_provider/views.py
+++ b/cas_provider/views.py
@@ -73,15 +73,14 @@ def login(request, template_name='cas/login.html', success_redirect='/account/',
                     errors.append('This account is disabled.')
             else:
                     errors.append('Incorrect username and/or password.')
+    else:
         if merge:
-            form = MergeLoginForm(request.GET, request=request)
+            form = MergeLoginForm(initial={'service': service, 'email': request.GET.get('email')})
         else:
-            form = LoginForm(request.GET, request=request)
-    else:
-      form = LoginForm(service)
-
+            form = LoginForm(initial={'service': service})
     return render_to_response(template_name, {'form': form, 'errors': errors}, context_instance=RequestContext(request))
 
+
 def socialauth_login(request, template_name='cas/login.html', success_redirect='/account/'):
     """ Similiar to login but user has been authenticated already through social auth.
         This step authenticates the login and generates a service ticket.