diff --git a/datacenterlight/tasks.py b/datacenterlight/tasks.py
index 61c6fb4b..3869a409 100644
--- a/datacenterlight/tasks.py
+++ b/datacenterlight/tasks.py
@@ -128,7 +128,7 @@ def create_vm_task(self, vm_template_id, user, specs, template,
             'storage': specs.get('disk_size'),
             'price': specs.get('price'),
             'template': template.get('name'),
-            'vm_name': vm['name'],
+            'vm_name': vm.get('name'),
             'vm_id': vm['vm_id'],
             'order_id': order.id
         }
diff --git a/hosting/templates/hosting/emails/new_booked_vm.html b/hosting/templates/hosting/emails/new_booked_vm.html
index 7ed963c6..bda0964e 100644
--- a/hosting/templates/hosting/emails/new_booked_vm.html
+++ b/hosting/templates/hosting/emails/new_booked_vm.html
@@ -19,7 +19,7 @@
         </tr>
         <tr>
             <td style="padding-top: 15px; padding-left: 30px; padding-right: 30px;">
-                <h1 style="font-family: Lato, Arial, sans-serif; font-size: 25px; font-weight: 400; margin: 0;">{% blocktrans %}Your New VM {{vm_name}}{% endblocktrans %}</h1>
+                <h1 style="font-family: Lato, Arial, sans-serif; font-size: 25px; font-weight: 400; margin: 0;">{% blocktrans %}Your New VM {{ vm_name }}{% endblocktrans %}</h1>
             </td>
         </tr>
         <tr>
diff --git a/hosting/views.py b/hosting/views.py
index f81e6c5a..3358ebaf 100644
--- a/hosting/views.py
+++ b/hosting/views.py
@@ -267,7 +267,6 @@ class SignupValidatedView(SignupValidateView):
         section_title = _('Account activation')
         user = CustomUser.objects.filter(
             validation_slug=self.kwargs['validate_slug']).first()
-        # pre_valid = user.validated
         if validated:
             message = '{account_activation_string} <br /> {login_string} {lurl}.'.format(
                 account_activation_string=_(