diff --git a/datacenterlight/tasks.py b/datacenterlight/tasks.py
index 55be8099..f080da90 100644
--- a/datacenterlight/tasks.py
+++ b/datacenterlight/tasks.py
@@ -62,7 +62,7 @@ def create_vm_task(self, vm_template_id, user, specs, template, order_id):
         )
 
         if 'pass' in user:
-            on_user = user.get('email')
+            on_user = user.get('username')
             on_pass = user.get('pass')
             logger.debug("Using user {user} to create VM".format(user=on_user))
             vm_name = None
diff --git a/datacenterlight/views.py b/datacenterlight/views.py
index 6042b0f0..aefaf6a8 100644
--- a/datacenterlight/views.py
+++ b/datacenterlight/views.py
@@ -1173,6 +1173,7 @@ class OrderConfirmationView(DetailView, FormView):
         user = {
             'name': custom_user.name,
             'email': custom_user.email,
+            'username': custom_user.username,
             'pass': custom_user.password,
             'request_scheme': request.scheme,
             'request_host': request.get_host(),
diff --git a/hosting/views.py b/hosting/views.py
index 9e0b5d5c..4ec13c12 100644
--- a/hosting/views.py
+++ b/hosting/views.py
@@ -1227,6 +1227,7 @@ class OrdersHostingDetailView(LoginRequiredMixin, DetailView, FormView):
         user = {
             'name': self.request.user.name,
             'email': self.request.user.email,
+            'username': self.request.user.username,
             'pass': self.request.user.password,
             'request_scheme': request.scheme,
             'request_host': request.get_host(),