diff --git a/beat/web/ui/registration/views.py b/beat/web/ui/registration/views.py
index 2db209b71d0ef42d46917eb380654209983d73fd..e1701e8135d4833af5db952eb7544dec3fda19c5 100644
--- a/beat/web/ui/registration/views.py
+++ b/beat/web/ui/registration/views.py
@@ -34,8 +34,7 @@ Views which allow users to create and activate accounts.
 from django.conf import settings
 from django.core.urlresolvers import reverse
 from django.http import HttpResponseRedirect
-from django.shortcuts import render_to_response
-from django.template import RequestContext
+from django.shortcuts import render
 from django.views.decorators.csrf import csrf_protect
 
 from .forms import RegistrationFormTermsOfService
@@ -97,10 +96,10 @@ def activate(request, activation_key,
     context = RequestContext(request)
     for key, value in extra_context.items():
         context[key] = callable(value) and value() or value
-    return render_to_response(template_name,
-                              { 'account': account,
-                                'expiration_days': settings.ACCOUNT_ACTIVATION_DAYS },
-                              context_instance=context)
+    return render(request,
+                  template_name,
+                  { 'account': account,
+                    'expiration_days': settings.ACCOUNT_ACTIVATION_DAYS })
 
 
 @csrf_protect
@@ -203,12 +202,11 @@ def register(request, success_url=None,
     for key, value in extra_context.items():
         context[key] = callable(value) and value() or value
 
-    return render_to_response(
-        template_name,
-        {
-            'form': form,
-            'form_supervisor': form_supervisor,
-            'supervisor_form_active': supervisor_form_active,
-            'url_prefix':settings.URL_PREFIX,
-            },
-        context_instance=context)
+    return render(request,
+                  template_name,
+                  {
+                      'form': form,
+                      'form_supervisor': form_supervisor,
+                      'supervisor_form_active': supervisor_form_active,
+                      'url_prefix':settings.URL_PREFIX,
+                  })