diff --git a/hosting/templates/hosting/virtual_machine_key.html b/hosting/templates/hosting/virtual_machine_key.html
index 4eaaf10f..157ceea8 100644
--- a/hosting/templates/hosting/virtual_machine_key.html
+++ b/hosting/templates/hosting/virtual_machine_key.html
@@ -115,7 +115,7 @@
 
 {% if next_url %}
     <script type="text/javascript"> 
-        window.location.href = '{{next_url}}'
+        window.location.href = '{{next_url}}';
     </script>
 {% endif %}
 
diff --git a/hosting/urls.py b/hosting/urls.py
index abfb8d5f..f09d3aa7 100644
--- a/hosting/urls.py
+++ b/hosting/urls.py
@@ -19,7 +19,7 @@ urlpatterns = [
     url(r'bills/?$', HostingBillListView.as_view(), name='bills'),
     url(r'bills/(?P<pk>\d+)/?$', HostingBillDetailView.as_view(), name='bills'),
     url(r'cancel_order/(?P<pk>\d+)/?$', OrdersHostingDeleteView.as_view(), name='delete_order'),
-    url(r'create-virtual-machine/?$', CreateVirtualMachinesView.as_view(), name='create-virtual-machine'),
+    url(r'create-virtual-machine/?$', CreateVirtualMachinesView.as_view(), name='create_virtual_machine'),
     url(r'my-virtual-machines/?$', VirtualMachinesPlanListView.as_view(), name='virtual_machines'),
     url(r'my-virtual-machines/(?P<pk>\d+)/?$', VirtualMachineView.as_view(),
         name='virtual_machines'),
diff --git a/hosting/views.py b/hosting/views.py
index 15306e13..b8b04b7d 100644
--- a/hosting/views.py
+++ b/hosting/views.py
@@ -324,7 +324,7 @@ class GenerateVMSSHKeysView(LoginRequiredMixin, FormView):
                 'private_key': form.cleaned_data.get('private_key'),
                 'key_name': form.cleaned_data.get('name'),
                 'form': UserHostingKeyForm(request=self.request),
-                'next_url': self.request.session.get('next', None)
+                'next_url': reverse('hosting:create_virtual_machine')
             })
 
         # return HttpResponseRedirect(reverse('hosting:key_pair'))