diff --git a/beat/web/ui/registration/views.py b/beat/web/ui/registration/views.py
index 000efd9d5940e31d0ce8de76abae517594bed62c..183f38831b95e94b7e6450849bbb929a4954e366 100644
--- a/beat/web/ui/registration/views.py
+++ b/beat/web/ui/registration/views.py
@@ -91,15 +91,15 @@ def activate(request, activation_key,
     """
     activationKey = activation_key.lower() # Normalize before trying anything with it.
     account = RegistrationProfile.objects.activate_user(activation_key)
-    if extra_context is None:
-        extra_context = {}
-    context = RequestContext(request)
-    for key, value in extra_context.items():
-        context[key] = callable(value) and value() or value
-    return render(request,
-                  template_name,
-                  { 'account': account,
-                    'expiration_days': settings.ACCOUNT_ACTIVATION_DAYS })
+
+    context = { 'account': account,
+                'expiration_days': settings.ACCOUNT_ACTIVATION_DAYS }
+
+    if extra_context is not None:
+        for key, value in extra_context.items():
+            context[key] = callable(value) and value() or value
+
+    return render(request, template_name, context)
 
 
 @csrf_protect
@@ -195,18 +195,14 @@ def register(request, success_url=None,
         form = form_class()
         form_supervisor = RegistrationFormTermsOfServiceSupervisor()
 
-    if extra_context is None:
-        extra_context = {}
-
-    context = RequestContext(request)
-    for key, value in extra_context.items():
-        context[key] = callable(value) and value() or value
-
-    return render(request,
-                  template_name,
-                  {
-                      'form': form,
-                      'form_supervisor': form_supervisor,
-                      'supervisor_form_active': supervisor_form_active,
-                      'url_prefix':settings.URL_PREFIX,
-                  })
+
+    context = { 'form': form,
+                'form_supervisor': form_supervisor,
+                'supervisor_form_active': supervisor_form_active,
+                'url_prefix':settings.URL_PREFIX }
+
+    if extra_context is not None:
+        for key, value in extra_context.items():
+            context[key] = callable(value) and value() or value
+
+    return render(request, template_name, context)