diff --git a/hosting/forms.py b/hosting/forms.py
index a8a60678..c94c4822 100644
--- a/hosting/forms.py
+++ b/hosting/forms.py
@@ -69,7 +69,9 @@ class UserHostingKeyForm(forms.ModelForm):
         # print(self.fields)
 
     def clean_name(self):
-        return ''.join(random.choice(string.ascii_lowercase) for i in range(7))
+        return "dcl-priv-key-%s" % (
+            ''.join(random.choice(string.ascii_lowercase) for i in range(7))
+        )
 
     def clean_user(self):
         return self.request.user
@@ -77,8 +79,6 @@ class UserHostingKeyForm(forms.ModelForm):
     def clean(self):
         cleaned_data = self.cleaned_data
 
-        print(cleaned_data)
-
         if not cleaned_data.get('public_key'):
             private_key, public_key = UserHostingKey.generate_keys()
             cleaned_data.update({
diff --git a/hosting/migrations/0039_hostingorder_price.py b/hosting/migrations/0039_hostingorder_price.py
new file mode 100644
index 00000000..0d4945fa
--- /dev/null
+++ b/hosting/migrations/0039_hostingorder_price.py
@@ -0,0 +1,21 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.4 on 2017-05-12 16:37
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('hosting', '0038_auto_20170512_1006'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='hostingorder',
+            name='price',
+            field=models.FloatField(default=0),
+            preserve_default=False,
+        ),
+    ]
diff --git a/hosting/models.py b/hosting/models.py
index 6eb0aa24..188f1733 100644
--- a/hosting/models.py
+++ b/hosting/models.py
@@ -1,5 +1,7 @@
 import os
 import socket
+import logging
+
 
 import oca
 from django.db import models
@@ -19,9 +21,9 @@ from .managers import VMPlansManager
 from oca.exceptions import OpenNebulaException
 from oca.pool import WrongNameError
 
-import logging
 logger = logging.getLogger(__name__)
 
+
 class HostingOrder(AssignPermissionsMixin, models.Model):
 
     ORDER_APPROVED_STATUS = 'Approved'
@@ -35,6 +37,7 @@ class HostingOrder(AssignPermissionsMixin, models.Model):
     last4 = models.CharField(max_length=4)
     cc_brand = models.CharField(max_length=10)
     stripe_charge_id = models.CharField(max_length=100, null=True)
+    price = models.FloatField()
 
     permissions = ('view_hostingorder',)
 
@@ -51,9 +54,13 @@ class HostingOrder(AssignPermissionsMixin, models.Model):
         return self.ORDER_APPROVED_STATUS if self.approved else self.ORDER_DECLINED_STATUS
 
     @classmethod
-    def create(cls, vm_plan=None, customer=None, billing_address=None):
-        instance = cls.objects.create(vm_plan=vm_plan, customer=customer,
-                                      billing_address=billing_address)
+    def create(cls, price=None, vm_id=None, customer=None, billing_address=None):
+        instance = cls.objects.create(
+            price=price,
+            vm_id=vm_id,
+            customer=customer,
+            billing_address=billing_address
+        )
         instance.assign_permissions(customer.user)
         return instance
 
@@ -67,6 +74,12 @@ class HostingOrder(AssignPermissionsMixin, models.Model):
         self.cc_brand = stripe_charge.source.brand
         self.save()
 
+    def get_cc_data(self):
+        return {
+            'last4': self.last4,
+            'cc_brand': self.cc_brand,
+        } if self.last4 and self.cc_brand else None
+
 
 class UserHostingKey(models.Model):
     user = models.ForeignKey(CustomUser)
diff --git a/hosting/opennebula_functions.py b/hosting/opennebula_functions.py
index a00bb037..aca5424d 100644
--- a/hosting/opennebula_functions.py
+++ b/hosting/opennebula_functions.py
@@ -35,7 +35,7 @@ class OpenNebulaManager:
         '11': 'CLONING_FAILURE',
     }
 
-    def __init__(self, email=None, password=None, create_user=True):
+    def __init__(self, email=None, password=None):
 
         # Get oneadmin client
         self.oneadmin_client = self._get_opennebula_client(
@@ -43,9 +43,6 @@ class OpenNebulaManager:
             settings.OPENNEBULA_PASSWORD
         )
 
-        if not create_user:
-            return
-
         # Get or create oppenebula user using given credentials
         self.opennebula_user = self._get_or_create_user(
             email,
@@ -121,9 +118,17 @@ class OpenNebulaManager:
 
         return vm_data
 
+    def change_user_password(self, new_password):
+        self.oneadmin_client.call(
+            oca.User.METHODS['passwd'],
+            self.opennebula_user.id,
+            new_password
+        )
+
     def create_vm(self, specs):
         vm_id = None
         try:
+
             # We do have the vm_template param set. Get and parse it
             # and check it to be in the desired range.
             # We have 8 possible VM templates for the moment which are 1x, 2x, 4x ...
@@ -136,6 +141,9 @@ class OpenNebulaManager:
                                         <TYPE>{disk_type}</TYPE>
                                         <SIZE>{size}</SIZE>
                                       </DISK>
+                                      <CONTEXT>
+                                        <SSH_PUBLIC_KEY>{ssh_key}</SSH_PUBLIC_KEY>
+                                      </CONTEXT>
                                     </VM>
                                     """
             vm_id = oca.VirtualMachine.allocate(
@@ -145,7 +153,8 @@ class OpenNebulaManager:
                     vcpu=specs.get('cores'),
                     cpu=0.1 * specs.get('cores'),
                     disk_type='fs',
-                    size=10000 * specs.get('disk_size')
+                    size=10000 * specs.get('disk_size'),
+                    ssh_key=specs.get('ssh_key')
                 )
             )
 
@@ -155,10 +164,6 @@ class OpenNebulaManager:
                 self.opennebula_user.id,
                 self.opennebula_user.group_ids[0]
             )
-            # oca.VirtualMachine.chown(
-            #     vm_id,
-               
-            # )
 
         except socket.timeout as socket_err:
             logger.error("Socket timeout error: {0}".format(socket_err))
@@ -171,6 +176,34 @@ class OpenNebulaManager:
 
         return vm_id
 
+    def terminate_vm(self, vm_id):
+
+        TERMINATE_ACTION = 'terminate'
+        vm_terminated = False
+
+        try:
+            self.oneadmin_client.call(
+                oca.VirtualMachine.METHODS['action'],
+                TERMINATE_ACTION,
+                int(vm_id),
+            )
+            vm_terminated = True
+        except socket.timeout as socket_err:
+            logger.error("Socket timeout error: {0}".format(socket_err))
+        except OpenNebulaException as opennebula_err:
+            logger.error("OpenNebulaException error: {0}".format(opennebula_err))
+        except OSError as os_err:
+            logger.error("OSError : {0}".format(os_err))
+        except ValueError as value_err:
+            logger.error("ValueError : {0}".format(value_err))
+
+        return vm_terminated
+
+    def get_vm_templates(self):
+        template_pool = oca.VmTemplatePool(self.oneadmin_client)
+        template_pool.info()
+        return template_pool
+
     def get_vm(self, email, vm_id):
         # Get vm's
         vms = self.get_vms(email)
@@ -198,9 +231,6 @@ class OpenNebulaManager:
 
         return vm_pool
 
-
-
-
 class HostingManageVMAdmin(admin.ModelAdmin):
     client = None
     oneadmin_client = None
diff --git a/hosting/static/hosting/js/payment.js b/hosting/static/hosting/js/payment.js
index c75e3d48..d06a5a3d 100644
--- a/hosting/static/hosting/js/payment.js
+++ b/hosting/static/hosting/js/payment.js
@@ -25,6 +25,27 @@ $( document ).ready(function() {
     });
 
 
+    var hasCreditcard = window.hasCreditcard || false;
+    console.log("has creditcard", hasCreditcard);
+    // hasCreditcard= true;
+
+    var submit_form_btn = $('#payment_button_with_creditcard');
+    submit_form_btn.on('click', submit_payment);
+
+
+    function submit_payment(e){ 
+      e.preventDefault();
+      console.log("creditcard sdasd");
+      // if (hasCreditcard) {
+         $('#billing-form').submit();
+         console.log("has creditcard2");
+      // }
+     
+      // $form.submit();
+    }
+
+
+
     var $form = $('#payment-form');
     $form.submit(payWithStripe);
 
diff --git a/hosting/templates/hosting/create_virtual_machine.html b/hosting/templates/hosting/create_virtual_machine.html
index 33c792e4..3a68421e 100644
--- a/hosting/templates/hosting/create_virtual_machine.html
+++ b/hosting/templates/hosting/create_virtual_machine.html
@@ -17,14 +17,14 @@
                                
                                   <option value="{{template.id}}">
                                                 CORE: {{template.cores}},
-                                                RAM: {{template.memory}},r
-                                                SSD: {{template.disk_size}}
+                                                RAM: {{template.memory}} GiB, 
+                                                SSD: {{template.disk_size}} GiB
                                   </option>
                                 
                             {% endfor %}
                         </select>
                     </div> 
-                    <div class="form-group">
+<!--                     <div class="form-group">
                         Select VM Configuration:
                         <select name="configuration">
                             {% for config in configuration_options %}
@@ -33,7 +33,7 @@
                                 
                             {% endfor %}
                         </select>
-                    </div>                          
+                    </div>  -->                         
                     <div class="form-group">
                         <button class="btn btn-success" >{% trans "Start VM"%} </button>                         
                     </div>
diff --git a/hosting/templates/hosting/payment.html b/hosting/templates/hosting/payment.html
index c30fe3f1..bb80d566 100644
--- a/hosting/templates/hosting/payment.html
+++ b/hosting/templates/hosting/payment.html
@@ -8,7 +8,7 @@
 			<div class="col-xs-12 col-md-4 col-md-offset-2 billing">
 				<h3><b>Billing Address</b></h3>
 				<hr>
-				<form role="form" id="billing-form" method="post" action="{% url 'hosting:payment' %}" novalidate>
+				<form role="form" id="billing-form" method="post" action="" novalidate>
 	                {% for field in form %}
                         {% csrf_token %}
 	                    {% bootstrap_field field show_label=False type='fields'%}
@@ -23,6 +23,17 @@
 				<hr>
 	            <div>
 	                <div>
+                    {% if credit_card_data.last4 %}
+                      <form role="form" id="payment-form-with-creditcard"novalidate>
+                        <h5 class="billing-head">Credit Card</h5>
+                        <h5 class="membership-lead">Last 4: *****{{credit_card_data.last4}}</h5>
+                        <h5 class="membership-lead">Type: {{credit_card_data.cc_brand}}</h5>
+                        <input type="hidden" name="credit_card_needed" value="false"/>
+                      </form>  
+                     <button id="payment_button_with_creditcard" class="btn btn-success btn-lg btn-block" type="submit">Submit Payment</button>
+                    {% else %}
+
+
 	                    <form role="form" id="payment-form" novalidate>
 	                        <div class="row">
 	                            <div class="col-xs-9 col-md-12">
@@ -76,6 +87,7 @@
 
                            
 	                    </form>
+                    {% endif %}
 	                </div>
 	            </div>
 	        </div>
@@ -109,6 +121,7 @@
 	</div>
 
 </div>
+
 <!-- stripe key data -->
 {% if stripe_key %}
 <script type="text/javascript"> 
@@ -116,6 +129,13 @@
 </script>
 {%endif%}
 
+{% if credit_card_data.last4 and credit_card_data.cc_brand %}
+<script type="text/javascript"> 
+     (function () {window.hasCreditcard = true;})();
+</script>
+
+{%endif%}
+
 {%endblock%}
 
 
diff --git a/hosting/templates/hosting/virtual_machine_detail.html b/hosting/templates/hosting/virtual_machine_detail.html
index a4ad37d4..e2f38d60 100644
--- a/hosting/templates/hosting/virtual_machine_detail.html
+++ b/hosting/templates/hosting/virtual_machine_detail.html
@@ -79,7 +79,7 @@
 								      <div class="col-md-3">
 								        <div class="well text-center">
 								        	<i class="fa fa-hdd-o" aria-hidden="true"></i> {% trans "Disk"%} <br/>
-								        	<span class="label label-success">{{virtual_machine.disk_size}} GiB</span>
+								        	<span class="label label-success">{{virtual_machine.disk_size|floatformat:2}} GiB</span>
 								        </div>
 								      </div>
 								    </div><!--/row-->    
@@ -107,6 +107,7 @@
 				            	<div class="row ">
 									<div class="col-md-12 inline-headers">
 										<h3>{% trans "Current status"%}</h3>
+
 										<div  class="pull-right space-above">
 											{% if virtual_machine.state == 'PENDING' %}
 												<span class="label
@@ -130,17 +131,28 @@
 											{% csrf_token %} 
 											</form>	
 												
-												<button type="text"
-                    data-href="{% url 'hosting:virtual_machines' virtual_machine.vm_id %}" data-toggle="modal" data-target="#confirm-cancel" class="btn btn-danger">{% trans "Cancel Virtual Machine"%}</button>
+												<button type="text" data-href="{% url 'hosting:virtual_machines' virtual_machine.vm_id %}" data-toggle="modal" data-target="#confirm-cancel" class="btn btn-danger">{% trans "Terminate Virtual Machine"%}</button>
 																						
 										</div>
+    
 									</div>
+                                    <div class="col-md-12">
+                                        <br/>
+                                        {% if messages %}
+                                            <div class="alert alert-warning">
+                                                {% for message in messages %}
+                                                <span>{{ message }}</span>
+                                                {% endfor %}
+                                            </div>
+                                        {% endif %}
+                                    </div>
+
 									<!-- Cancel Modal -->
 									<div class="modal fade" id="confirm-cancel" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
 									    <div class="modal-dialog">
 									        <div class="modal-content">
 									            <div class="modal-header">
-									                {% trans "Cancel your Virtual Machine"%}
+									                {% trans "Terminate your Virtual Machine"%}
 									            </div>
 									            <div class="modal-body">
 									                {% trans "Are you sure do you want to cancel your Virtual Machine "%} {{virtual_machine.name}}  {% trans "plan?"%}
diff --git a/hosting/templates/hosting/virtual_machine_key.html b/hosting/templates/hosting/virtual_machine_key.html
index 8a0221ae..0ea4abe5 100644
--- a/hosting/templates/hosting/virtual_machine_key.html
+++ b/hosting/templates/hosting/virtual_machine_key.html
@@ -9,11 +9,18 @@
                     <form method="POST" action="" >
                         {% csrf_token %}
 				        <h3><i class="fa fa-key" aria-hidden="true"></i>{% trans "Access Key"%} </h3>
+                        {% if messages %}
+                        <div class="alert alert-warning">
+                            {% for message in messages %}
+                            <span>{{ message }}</span>
+                            {% endfor %}
+                        </div>
+                        {% endif %}
 				        <hr/>	
                         {% if not user_key %}
-                            <div class="alert alert-warning">
+                            <h3>
                                 {% trans "Upload your own key. "%} 
-                            </div>
+                            </h3>
                             <div class="form-group">
                               <label for="comment">Paste here your public key</label>
                               <textarea class="form-control" rows="6" name="public_key"></textarea>
@@ -22,10 +29,10 @@
                                 <button class="btn btn-success">{% trans "Upload Key"%} </a>
                             </div>
                         
-                            <div class="alert alert-warning">
+                            <h3>
                                 {% trans "Or generate a new key pair."%} 
 
-                            </div>
+                            </h3>
                             <div class="form-group">
                                 <button class="btn btn-success">{% trans "Generate Key Pair"%} </a>
                             </div>
@@ -58,7 +65,7 @@
 				        {% if private_key %}
 				 		<div class="alert alert-warning">
 				 			 
-  							<strong>{% trans "Warning!"%}</strong>{% trans "You can view your SSH  private key once. Copy it or if it wasn't downloaded automatically, just click on Download to start it."%}  
+  							<strong>{% trans "Warning!"%}</strong>{% trans "You can download your SSH  private key once. Don't lost your key"%}  
 						</div>
 						<div class="form-group">
 						  <textarea class="form-control" rows="6" id="ssh_key" type="hidden" style="display:none">{{private_key}}</textarea>
@@ -101,6 +108,7 @@
 		// Remove anchor from body
 		document.body.removeChild(a);
 
+
 </script>
 {%endif%}
 
diff --git a/hosting/templates/hosting/virtual_machines.html b/hosting/templates/hosting/virtual_machines.html
index e2a5d61d..bb99c5e1 100644
--- a/hosting/templates/hosting/virtual_machines.html
+++ b/hosting/templates/hosting/virtual_machines.html
@@ -11,6 +11,16 @@
                     <a class="btn btn-success" href="{% url 'hosting:create-virtual-machine' %}" >{% trans "Create VM"%} </a>                    
                 </p>
 				<br/>
+                <div class="col-md-12">
+                    <br/>
+                    {% if messages %}
+                        <div class="alert alert-warning">
+                            {% for message in messages %}
+                            <span>{{ message }}</span>
+                            {% endfor %}
+                        </div>
+                    {% endif %}
+                </div>
 				<thead> 
 				<tr> 
 					<th>{% trans "ID"%}</th>
@@ -28,7 +38,7 @@
                            
 							{% if vm.state == 'ACTIVE' %}
 								<span class="h3 label label-success"><strong> {{vm.state}}</strong></span>
-							{% elif  vm.state == 'POWEROFF' %}
+							{% elif  vm.state == 'FAILED' %}
 								<span class="h3 label label-danger"><strong>{{vm.state}}</strong></span>
 							{% else %}
 								<span class="h3 label label-warning"><strong>{{vm.state}}</strong></span>
diff --git a/hosting/views.py b/hosting/views.py
index 4a6ad3b8..b292ce45 100644
--- a/hosting/views.py
+++ b/hosting/views.py
@@ -11,7 +11,8 @@ from django.contrib.auth import authenticate, login
 from django.contrib import messages
 from django.conf import settings
 from django.shortcuts import redirect
-
+from django.utils.http import urlsafe_base64_decode
+from django.contrib.auth.tokens import default_token_generator
 
 from guardian.mixins import PermissionRequiredMixin
 from stored_messages.settings import stored_messages_settings
@@ -21,7 +22,7 @@ from stored_messages.api import mark_read
 
 from membership.models import CustomUser, StripeCustomer
 from utils.stripe_utils import StripeUtils
-from utils.forms import BillingAddressForm, PasswordResetRequestForm
+from utils.forms import BillingAddressForm, PasswordResetRequestForm, UserBillingAddressForm
 from utils.views import PasswordResetViewMixin, PasswordResetConfirmViewMixin, LoginViewMixin
 from utils.mailer import BaseEmail
 from .models import HostingOrder, HostingBill, UserHostingKey
@@ -162,7 +163,7 @@ class SignupView(CreateView):
     model = CustomUser
 
     def get_success_url(self):
-        next_url = self.request.session.get('next', reverse_lazy('hosting:signup'))
+        next_url = self.request.session.get('next', reverse_lazy('hosting:virtual_machines'))
         return next_url
 
     def form_valid(self, form):
@@ -188,6 +189,43 @@ class PasswordResetConfirmView(PasswordResetConfirmViewMixin):
     template_name = 'hosting/confirm_reset_password.html'
     success_url = reverse_lazy('hosting:login')
 
+    def post(self, request, uidb64=None, token=None, *arg, **kwargs):
+        try:
+            uid = urlsafe_base64_decode(uidb64)
+            user = CustomUser.objects.get(pk=uid)
+
+            opennebula_client = OpenNebulaManager(
+                email=user.email,
+                password=user.password,
+            )
+
+        except (TypeError, ValueError, OverflowError, CustomUser.DoesNotExist):
+            user = None
+            opennebula_client = None
+
+        form = self.form_class(request.POST)
+
+        if user is not None and default_token_generator.check_token(user, token):
+            if form.is_valid():
+                new_password = form.cleaned_data['new_password2']
+                user.set_password(new_password)
+                user.save()
+                messages.success(request, 'Password has been reset.')
+
+                # Change opennebula password
+                opennebula_client.change_user_password(new_password)
+
+                return self.form_valid(form)
+            else:
+                messages.error(request, 'Password reset has not been successful.')
+                form.add_error(None, 'Password reset has not been successful.')
+                return self.form_invalid(form)
+
+        else:
+            messages.error(request, 'The reset password link is no longer valid.')
+            form.add_error(None, 'The reset password link is no longer valid.')
+            return self.form_invalid(form)
+
 
 class NotificationsView(LoginRequiredMixin, TemplateView):
     template_name = 'hosting/notifications.html'
@@ -228,18 +266,19 @@ class GenerateVMSSHKeysView(LoginRequiredMixin, FormView):
     context_object_name = "virtual_machine"
 
     def get_context_data(self, **kwargs):
-        try:
-            user_key = UserHostingKey.objects.get(
-                user=self.request.user
-            )
-        except UserHostingKey.DoesNotExist:
-            user_key = None
-
         context = super(
             GenerateVMSSHKeysView,
             self
         ).get_context_data(**kwargs)
 
+        try:
+            user_key = UserHostingKey.objects.get(
+                user=self.request.user
+            )
+
+        except UserHostingKey.DoesNotExist:
+            user_key = None
+
         context.update({
             'user_key': user_key
         })
@@ -258,36 +297,102 @@ class GenerateVMSSHKeysView(LoginRequiredMixin, FormView):
         if form.cleaned_data.get('private_key'):
             context.update({
                 'private_key': form.cleaned_data.get('private_key'),
-                'key_name': form.cleaned_data.get('name')
+                'key_name': form.cleaned_data.get('name'),
+                'form': UserHostingKeyForm(request=self.request)
             })
 
-        # print("form", form.cleaned_data)
-
+        # return HttpResponseRedirect(reverse('hosting:key_pair'))
         return render(self.request, self.template_name, context)
 
+    def post(self, request, *args, **kwargs):
+
+        try:
+            UserHostingKey.objects.get(
+                user=self.request.user
+            )
+            return HttpResponseRedirect(reverse('hosting:key_pair'))
+
+        except UserHostingKey.DoesNotExist:
+            pass
+
+        form = self.get_form()
+        if form.is_valid():
+            return self.form_valid(form)
+        else:
+            return self.form_invalid(form)
+
 
 class PaymentVMView(LoginRequiredMixin, FormView):
     template_name = 'hosting/payment.html'
     login_url = reverse_lazy('hosting:login')
     form_class = BillingAddressForm
 
+    def get_form_kwargs(self):
+        current_billing_address = self.request.user.billing_addresses.first()
+        form_kwargs = super(PaymentVMView, self).get_form_kwargs()
+        if not current_billing_address:
+            return form_kwargs
+
+        form_kwargs.update({
+            'initial': {
+                'street_address': current_billing_address.street_address,
+                'city': current_billing_address.city,
+                'postal_code': current_billing_address.postal_code,
+                'country': current_billing_address.country,
+            }
+        })
+        return form_kwargs
+
     def get_context_data(self, **kwargs):
         context = super(PaymentVMView, self).get_context_data(**kwargs)
+        # Get user
+        user = self.request.user
+
+        # Get user last order
+        last_hosting_order = HostingOrder.objects.filter(customer__user=user).last()
+
+        # If user has already an hosting order, get the credit card data from it
+        if last_hosting_order:
+            credit_card_data = last_hosting_order.get_cc_data()
+            context.update({
+                'credit_card_data': credit_card_data if credit_card_data else None,
+            })
+
         context.update({
             'stripe_key': settings.STRIPE_API_PUBLIC_KEY
         })
 
         return context
 
+    def get(self, request, *args, **kwargs):
+
+        try:
+            UserHostingKey.objects.get(
+                user=self.request.user
+            )
+        except UserHostingKey.DoesNotExist:
+            messages.success(
+                request,
+                'In order to create a VM, you create/upload your SSH KEY first.'
+            )
+            return HttpResponseRedirect(reverse('hosting:key_pair'))
+
+        return self.render_to_response(self.get_context_data())
+
     def post(self, request, *args, **kwargs):
         form = self.get_form()
 
         if form.is_valid():
+
+            # Get billing address data
+            billing_address_data = form.cleaned_data
+
             context = self.get_context_data()
+
             specifications = request.session.get('template')
 
             vm_template_id = specifications.get('id', 1)
-            
+
             final_price = specifications.get('price', 1)
 
             token = form.cleaned_data.get('token')
@@ -320,21 +425,46 @@ class PaymentVMView(LoginRequiredMixin, FormView):
 
             charge = charge_response.get('response_object')
 
-            # Create OpenNebulaManager 
-            
+            # Create OpenNebulaManager
             manager = OpenNebulaManager(email=owner.email,
-                                        password=owner.password[0:20],
+                                        password=owner.password,
                                         create_user=True)
             template = manager.get_template(vm_template_id)
 
+            # Get user ssh key
+            try:
+                user_key = UserHostingKey.objects.get(
+                    user=self.request.user
+                )
+
+            except UserHostingKey.DoesNotExist:
+                pass
+
             # Create a vm using logged user
-            vm_id = manager.create_vm(vm_template_id)
+            vm_id = manager.create_vm(
+                vm_template_id,
+                ssh_key=user_key.public_key
+            )
+
             # Create a Hosting Order
-            order = HostingOrder.create(vm_id=vm_id, customer=customer,
-                                        billing_address=billing_address)
+            order = HostingOrder.create(
+                price=final_price,
+                vm_id=vm_id,
+                customer=customer,
+                billing_address=billing_address
+            )
+
             # Create a Hosting Bill
             bill = HostingBill.create(customer=customer, billing_address=billing_address)
 
+            # Create Billing Address for User if he does not have one
+            if not customer.user.billing_addresses.count():
+                billing_address_data.update({
+                    'user': customer.user.id
+                })
+                billing_address_user_form = UserBillingAddressForm(billing_address_data)
+                billing_address_user_form.is_valid()
+                billing_address_user_form.save()
 
             # Associate an order with a stripe payment
             order.set_stripe_charge(charge)
@@ -344,7 +474,6 @@ class PaymentVMView(LoginRequiredMixin, FormView):
 
             vm = VirtualMachineSerializer(manager.get_vm(vm_id)).data
 
-
             # Send notification to ungleich as soon as VM has been booked
             context = {
                 'vm': vm,
@@ -380,10 +509,11 @@ class OrdersHostingDetailView(PermissionRequiredMixin, LoginRequiredMixin, Detai
         obj = self.get_object()
         owner = self.request.user
         manager = OpenNebulaManager(email=owner.email,
-                                    password=owner.password[0:20],
+                                    password=owner.password,
                                     create_user=True)
         vm = manager.get_vm(obj.vm_id)
         context['vm'] = VirtualMachineSerializer(vm).data
+        return context
 
 
 class OrdersHostingListView(LoginRequiredMixin, ListView):
@@ -416,7 +546,7 @@ class VirtualMachinesPlanListView(LoginRequiredMixin, ListView):
     def get_queryset(self):
         owner = self.request.user
         manager = OpenNebulaManager(email=owner.email,
-                                    password=owner.password[0:20],
+                                    password=owner.password,
                                     create_user=True)
         queryset = manager.get_vms()
         serializer = VirtualMachineSerializer(queryset, many=True)
@@ -428,29 +558,33 @@ class CreateVirtualMachinesView(LoginRequiredMixin, View):
     login_url = reverse_lazy('hosting:login')
 
     def get(self, request, *args, **kwargs):
+
+        try:
+            UserHostingKey.objects.get(
+                user=self.request.user
+            )
+        except UserHostingKey.DoesNotExist:
+            messages.success(
+                request,
+                'In order to create a VM, you need to create/upload your SSH KEY first.'
+            )
+            return HttpResponseRedirect(reverse('hosting:key_pair'))
+
         #TODO: Replace with OpenNebulaManager.get_apps
         templates = OpenNebulaManager().get_templates()
         data = VirtualMachineTemplateSerializer(templates, many=True).data
+
         context = {
             'templates': data,
-            #'configuration_options': VirtualMachinePlan.VM_CONFIGURATION
         }
         # context = {}
         return render(request, self.template_name, context)
 
     def post(self, request):
-        #XXX: Fix this!
-        #configuration = request.POST.get('configuration')
-        #configuration_display = dict(VirtualMachinePlan.VM_CONFIGURATION).get(configuration)
         template_id = int(request.POST.get('vm_template_id'))
         template = OpenNebulaManager().get_template(template_id)
         data = VirtualMachineTemplateSerializer(template).data
-        vm_specs = {
-            #'configuration_display': configuration_display,
-            #'configuration': configuration,
-            'template': data, 
-        }
-        request.session['template'] = data 
+        request.session['template'] = data
         return redirect(reverse('hosting:payment'))
 
 
@@ -458,28 +592,56 @@ class VirtualMachineView(LoginRequiredMixin, View):
     template_name = "hosting/virtual_machine_detail.html"
     login_url = reverse_lazy('hosting:login')
 
-    def get(self, request, *args, **kwargs):
+    def get_object(self):
         owner = self.request.user
-        manager = OpenNebulaManager(email=owner.email,
-                                    password=owner.password[0:20],
-                                    create_user=True)
+        vm = None
+        manager = OpenNebulaManager(
+            email=owner.email,
+            password=owner.password,
+            create_user=True
+        )
         vm_id = self.kwargs.get('pk')
         try:
             vm = manager.get_vm(vm_id)
-            serializer = VirtualMachineSerializer(vm)
         except Exception as error:
             print(error)
             raise Http404()
+        return vm
 
+    def get_success_url(self):
+        final_url = reverse('hosting:virtual_machines')
+        return final_url
+
+    def get(self, request, *args, **kwargs):
+        vm = self.get_object()
+        serializer = VirtualMachineSerializer(vm)
         context = {
             'virtual_machine': serializer.data,
         }
         return render(request, self.template_name, context)
 
-    def post(self, *args, **kwargs):
-        #TODO: add api to OpenNebulaManager
+    def post(self, request, *args, **kwargs):
+        owner = self.request.user
         vm = self.get_object()
-        vm.cancel_plan()
+
+        opennebula_vm_id = self.kwargs.get('pk')
+
+        manager = OpenNebulaManager(
+            email=owner.email,
+            password=owner.password,
+            create_user=True
+        )
+
+        terminated = manager.delete_vm(
+            vm.id
+        )
+
+        if not terminated:
+            messages.error(
+                request,
+                'Error terminating VM %s' % (opennebula_vm_id)
+            )
+            return HttpResponseRedirect(self.get_success_url())
 
         context = {
             'vm': vm,
@@ -495,8 +657,14 @@ class VirtualMachineView(LoginRequiredMixin, View):
         email = BaseEmail(**email_data)
         email.send()
 
+        messages.error(
+            request,
+            'VM %s terminated successfully' % (opennebula_vm_id)
+        )
+
         return HttpResponseRedirect(self.get_success_url())
 
+
 class HostingBillListView(LoginRequiredMixin, ListView):
     template_name = "hosting/bills.html"
     login_url = reverse_lazy('hosting:login')
@@ -505,6 +673,7 @@ class HostingBillListView(LoginRequiredMixin, ListView):
     paginate_by = 10
     ordering = '-id'
 
+
 class HostingBillDetailView(PermissionRequiredMixin, LoginRequiredMixin, DetailView):
     template_name = "hosting/bill_detail.html"
     login_url = reverse_lazy('hosting:login')
@@ -513,7 +682,7 @@ class HostingBillDetailView(PermissionRequiredMixin, LoginRequiredMixin, DetailV
     model = HostingBill
 
     def get_object(self, queryset=None):
-        #Get HostingBill for primary key (Select from customer users)
+        # Get HostingBill for primary key (Select from customer users)
         pk = self.kwargs['pk']
         object = HostingBill.objects.filter(customer__id=pk).first()
         if object is None:
@@ -526,7 +695,7 @@ class HostingBillDetailView(PermissionRequiredMixin, LoginRequiredMixin, DetailV
 
         owner = self.request.user
         manager = OpenNebulaManager(email=owner.email,
-                                    password=owner.password[0:20],
+                                    password=owner.password,
                                     create_user=True)
         # Get vms
         queryset = manager.get_vms()
diff --git a/opennebula_api/models.py b/opennebula_api/models.py
index 4ec99673..8c7743b4 100644
--- a/opennebula_api/models.py
+++ b/opennebula_api/models.py
@@ -1,10 +1,14 @@
 import oca
 import socket
+import logging
+
 
 from django.conf import settings
 from django.utils.functional import cached_property
 
 from oca.pool import WrongNameError
+from oca.exceptions import OpenNebulaException
+logger = logging.getLogger(__name__)
 
 class OpenNebulaManager():
     """This class represents an opennebula manager."""
@@ -99,14 +103,17 @@ class OpenNebulaManager():
         return vm_pool.get_by_id(int(vm_id))
 
     #TODO: get app with id 
-    def create_vm(self, template_id, app_id=None):
+    def create_vm(self, template_id, app_id=None, ssh_key=None):
+        extra_template = "<CONTEXT><SSH_PUBLIC_KEY>{ssh_key}</SSH_PUBLIC_KEY></CONTEXT>".format(
+            ssh_key=ssh_key
+        )
         vm_id = self.oneadmin_client.call(
-                    oca.VmTemplate.METHODS['instantiate'],
-                    template_id,
-                    '',
-                    False,
-                    ''
-                )
+            oca.VmTemplate.METHODS['instantiate'],
+            template_id,
+            '',
+            False,
+            extra_template
+        )
         try:
             self.oneadmin_client.call(
                 oca.VirtualMachine.METHODS['chown'],
@@ -119,11 +126,29 @@ class OpenNebulaManager():
         return vm_id
 
     def delete_vm(self, vm_id):
-        self.oneadmin_client.call(
-                oca.VirtualMachine.METHODS['action'], 
-                'terminate',
-                int(vm_id)
-                )
+        TERMINATE_ACTION = 'terminate'
+        vm_terminated = False
+        try:
+            self.oneadmin_client.call(
+                oca.VirtualMachine.METHODS['action'],
+                TERMINATE_ACTION,
+                int(vm_id),
+            )
+            vm_terminated = True
+        except socket.timeout as socket_err:
+            logger.info("Socket timeout error: {0}".format(socket_err))
+            print("Socket timeout error: {0}".format(socket_err))
+        except OpenNebulaException as opennebula_err:
+            logger.info("OpenNebulaException error: {0}".format(opennebula_err))
+            print("OpenNebulaException error: {0}".format(opennebula_err))
+        except OSError as os_err:
+            logger.info("OSError : {0}".format(os_err))
+            print("OSError : {0}".format(os_err))
+        except ValueError as value_err:
+            logger.info("ValueError : {0}".format(value_err))
+            print("ValueError : {0}".format(value_err))
+
+        return vm_terminated
 
     def _get_template_pool(self):
         try:
diff --git a/opennebula_api/serializers.py b/opennebula_api/serializers.py
index 8ca95013..b73682e6 100644
--- a/opennebula_api/serializers.py
+++ b/opennebula_api/serializers.py
@@ -91,7 +91,7 @@ class VirtualMachineSerializer(serializers.Serializer):
 
         try:
             manager = OpenNebulaManager(email=owner.email,
-                                        password=owner.password[0:20],
+                                        password=owner.password,
                                         create_user = True)
             opennebula_id = manager.create_vm(template_id)
         except OpenNebulaException as err:
diff --git a/opennebula_api/views.py b/opennebula_api/views.py
index c537e2e5..20a28968 100644
--- a/opennebula_api/views.py
+++ b/opennebula_api/views.py
@@ -47,7 +47,7 @@ class VmCreateView(generics.ListCreateAPIView):
     def get_queryset(self):
         owner = self.request.user
         manager = OpenNebulaManager(email=owner.email,
-                                    password=owner.password[0:20],
+                                    password=owner.password,
                                     create_user=True)
         return manager.get_vms()
 
@@ -64,21 +64,21 @@ class VmDetailsView(generics.RetrieveUpdateDestroyAPIView):
     def get_queryset(self):
         owner = self.request.user
         manager = OpenNebulaManager(email=owner.email,
-                                    password=owner.password[0:20],
+                                    password=owner.password,
                                     create_user=True)
         return manager.get_vms()
 
     def get_object(self):
         owner = self.request.user
         manager = OpenNebulaManager(email=owner.email,
-                                    password=owner.password[0:20],
+                                    password=owner.password,
                                     create_user=True)
         return manager.get_vm(self.kwargs.get('pk'))
 
     def perform_destroy(self, instance):
         owner = self.request.user
         manager = OpenNebulaManager(email=owner.email,
-                                    password=owner.password[0:20],
+                                    password=owner.password,
                                     create_user = True)
         manager.delete_vm(instance.id)
 
diff --git a/utils/forms.py b/utils/forms.py
index dd6f7a85..c50b1a0b 100644
--- a/utils/forms.py
+++ b/utils/forms.py
@@ -100,7 +100,7 @@ class EditCreditCardForm(forms.Form):
 
 
 class BillingAddressForm(forms.ModelForm):
-    token = forms.CharField(widget=forms.HiddenInput())
+    token = forms.CharField(widget=forms.HiddenInput(), required=False)
 
     class Meta:
         model = BillingAddress