diff --git a/idhub/templates/idhub/admin/issue_credentials.html b/idhub/templates/idhub/admin/issue_credentials.html
index 51d14ba..216690e 100644
--- a/idhub/templates/idhub/admin/issue_credentials.html
+++ b/idhub/templates/idhub/admin/issue_credentials.html
@@ -51,7 +51,7 @@
     {% if object.issued_on %}
     <div class="row mt-3">
       <div class="col text-center">
-        <a class="btn btn-green-admin" href="{% url 'idhub:admin_credential_json' object.id %}">{% trans 'View in JSON format' %}</a>
+        <a class="btn btn-green-admin" href="{% url 'idhub:admin_credential_json' object.id %}">{% trans 'Download in JSON format' %}</a>
       </div>
     </div>
     {% endif %}
diff --git a/idhub/templates/idhub/user/credential.html b/idhub/templates/idhub/user/credential.html
index 7152049..ac5c14e 100644
--- a/idhub/templates/idhub/user/credential.html
+++ b/idhub/templates/idhub/user/credential.html
@@ -46,11 +46,13 @@
   </div>
   {% endif %}
   <div class="col text-center">
-    <a class="btn btn-green-user" href="{% url 'idhub:user_credential_json' object.id %}">{% trans 'View credential in JSON format' %}</a>
+    <a class="btn btn-green-user" href="{% url 'idhub:user_credential_json' object.id %}">{% trans 'Download credential in JSON format' %}</a>
   </div>
   {% endif %}
   {% if object.get_status == 'Enabled' %}
+  <div class="col text-center">
     <a class="btn btn-green-user" href="{% url 'idhub:user_credentials_request' %}">{% trans 'Request credential' %}</a>
+  </div>
   {% endif %}
 </div>
 {% endblock %}