diff --git a/hosting/templates/hosting/order_detail.html b/hosting/templates/hosting/order_detail.html
index 868680aa..7b63c927 100644
--- a/hosting/templates/hosting/order_detail.html
+++ b/hosting/templates/hosting/order_detail.html
@@ -61,7 +61,7 @@
             {% url 'hosting:payment' as payment_url %}
             {% if payment_url in request.META.HTTP_REFERER  %}
             <div class=" content pull-right">
-                <a href="{% url 'hosting:key_pair'%}" ><button class="btn btn-info">{% trans "Finish Configuration"%}</button></a>
+                <a href="{% url 'hosting:virtual_machines'%}" ><button class="btn btn-info">{% trans "Finish Configuration"%}</button></a>
             </div>
             {% endif %}
         </div>
diff --git a/hosting/views.py b/hosting/views.py
index af86b825..3f309060 100644
--- a/hosting/views.py
+++ b/hosting/views.py
@@ -188,10 +188,11 @@ class SignupView(CreateView):
     template_name = 'hosting/signup.html'
     form_class = HostingUserSignupForm
     model = CustomUser
+    success_url = reverse_lazy('hosting:key_pair')
 
     def get_success_url(self):
         next_url = self.request.session.get(
-            'next', reverse_lazy('hosting:virtual_machines'))
+            'next', self.success_url)
         return next_url
 
     def form_valid(self, form):