diff --git a/apps/users/views/login.py b/apps/users/views/login.py
index 97a4e44fd..1d52dd605 100644
--- a/apps/users/views/login.py
+++ b/apps/users/views/login.py
@@ -17,7 +17,7 @@ from django.views.decorators.csrf import csrf_protect
 from django.views.decorators.debug import sensitive_post_parameters
 from django.views.generic.base import TemplateView
 from django.views.generic.edit import FormView
-# from formtools.wizard.views import SessionWizardView
+from formtools.wizard.views import SessionWizardView
 from django.conf import settings
 from django.utils import timezone
 
@@ -160,8 +160,7 @@ class UserResetPasswordView(TemplateView):
         return HttpResponseRedirect(reverse('users:reset-password-success'))
 
 
-class UserFirstLoginView(LoginRequiredMixin, ListView):
-#    class UserFirstLoginView(LoginRequiredMixin, SessionWizardView):
+class UserFirstLoginView(LoginRequiredMixin, SessionWizardView):
     template_name = 'users/first_login.html'
     form_list = [forms.UserProfileForm, forms.UserPublicKeyForm]
     file_storage = default_storage