diff --git a/hosting/templates/hosting/login.html b/hosting/templates/hosting/login.html
index 2f1693ac..3f3a60b7 100644
--- a/hosting/templates/hosting/login.html
+++ b/hosting/templates/hosting/login.html
@@ -38,6 +38,8 @@
                                 {% trans "Login"%}
                             </button>
                         {% endbuttons %}
+						
+						<input type='hidden' name='next' value='{{request.GET.next}}'/> 
                     </form>
                     <span>{% trans "Don't have an account yet ? "%}<a class="unlink" href="{% url 'hosting:signup' %}">{% trans "Sign up"%}</a></span>
                     <br/>
diff --git a/utils/views.py b/utils/views.py
index e69bac1d..75506959 100644
--- a/utils/views.py
+++ b/utils/views.py
@@ -39,7 +39,7 @@ class LoginViewMixin(FormView):
     success_url = None
 
     def get_success_url(self):
-        next_url = self.request.session.get('next', self.success_url)
+        next_url = self.request.POST.get('next', self.success_url)
         return next_url
 
     def form_valid(self, form):