diff --git a/src/authentic2_beid/views.py b/src/authentic2_beid/views.py
index eb3f348..6986c93 100644
--- a/src/authentic2_beid/views.py
+++ b/src/authentic2_beid/views.py
@@ -73,7 +73,8 @@ def delete_beid(request, certificate_pk):
 
 def x509(request, registration_token):
     ssl_info = SSLInfo(request)
-    request.session['ssl_info'] = ssl_info.__dict__
+    if ssl_info.get('subject_dn'):
+        request.session['ssl_info'] = ssl_info.__dict__
     return redirect(request, 'beid_registration_activate',
                     kwargs={'registration_token': registration_token})
 
@@ -88,8 +89,9 @@ class BeIDRegistrationCompletionView(RegistrationCompletionView):
     def get_form_kwargs(self, **kwargs):
         kw = super(BeIDRegistrationCompletionView, self).get_form_kwargs(**kwargs)
         # get first and last names from certificate and fill the form
-        f_name, l_name = get_user_names(self.request.session['ssl_info'])
-        kw['initial'].update({'first_name': f_name, 'last_name': l_name})
+        if self.request.session.get('ssl_info'):
+            f_name, l_name = get_user_names(self.request.session['ssl_info'])
+            kw['initial'].update({'first_name': f_name, 'last_name': l_name})
         return kw
 
     def form_valid(self, form):