diff --git a/datacenterlight/templates/datacenterlight/order_detail.html b/datacenterlight/templates/datacenterlight/order_detail.html
index fa2ba7ca..1f01c201 100644
--- a/datacenterlight/templates/datacenterlight/order_detail.html
+++ b/datacenterlight/templates/datacenterlight/order_detail.html
@@ -151,6 +151,15 @@
                 <div class="dashboard-container-head">
                     <h2 class="dashboard-title-thin"><i class="fa fa-key" aria-hidden="true"></i>&nbsp;{% trans "Add your public SSH key" %}</h2>
                 </div>
+            <div class="previous-keys">
+                {% if keys|length > 0 %}
+                <div class="previous-keys-title">Previous keys</div>
+                {% endif %}
+                {% for key in keys %}
+                <textarea cols="79" readonly  oninput='this.style.height = "";this.style.height = this.scrollHeight + "px"'></textarea>
+                    <br/>
+                {% endfor %}
+            </>
                 {% for field in form %}
                     {% bootstrap_field field %}
                 {% endfor %}
diff --git a/datacenterlight/views.py b/datacenterlight/views.py
index f01766d1..7aa6d8a4 100644
--- a/datacenterlight/views.py
+++ b/datacenterlight/views.py
@@ -25,7 +25,7 @@ from utils.forms import (
     BillingAddressForm, BillingAddressFormSignup, UserBillingAddressForm,
     BillingAddress
 )
-from utils.hosting_utils import get_vm_price_with_vat
+from utils.hosting_utils import get_vm_price_with_vat, get_all_public_keys
 from utils.stripe_utils import StripeUtils
 from utils.tasks import send_plain_email_task
 from .cms_models import DCLCalculatorPluginModel
@@ -575,6 +575,7 @@ class OrderConfirmationView(DetailView, FormView):
             context.update({
                 'vm': request.session.get('specs'),
                 'form': UserHostingKeyForm(request=self.request),
+                'keys': get_all_public_keys(self.request.user)
             })
         context.update({
             'site_url': reverse('datacenterlight:index'),
@@ -607,7 +608,6 @@ class OrderConfirmationView(DetailView, FormView):
         # We have a valid SSH key from the user, save it in opennebula and db
         # and proceed further
         form.save()
-        user_public_key = form.data["public_key"]
 
         if 'token' in request.session:
             card_details = stripe_utils.get_cards_details_from_token(