diff --git a/contracts/templates/contracts/view_contract.html b/contracts/templates/contracts/view_contract.html
index b533e30a10b2272036e3ade21afbc0af37f4ea24..4d2e96b35dda3ba5f464240ea36648c0c9395cd4 100644
--- a/contracts/templates/contracts/view_contract.html
+++ b/contracts/templates/contracts/view_contract.html
@@ -343,10 +343,11 @@
 
                             {{ signature.contractee.address_street_with_number }}<br>
                             {{ signature.contractee.address_zip }} {{ signature.contractee.address_district }}<br>
-                            {{ signature.contractee.get_address_country_display }}<br>
+                            {{ signature.contractee.address_country }}
 
                             {% if signature.contractee.ico_number %}
-                                IČO: {{ signature.contractee.ico_number }}<br>
+                                <br><br>
+                                IČO: {{ signature.contractee.ico_number }}
                             {% endif %}
                         </address>
 
@@ -404,7 +405,7 @@
                                 {{ signature.signee.get_entity_type_display }}
                             </div>
 
-                            {% if user.can_view_confidential %}
+                            {% if user.can_view_confidential and not signature.signee.entity_has_public_address %}
                                 <div class="border !bg-red-100 border-red-200 p-1.5 rounded-md mt-1.5 mb-2 inline-block">
                             {% endif %}
 
@@ -423,16 +424,22 @@
                             {% if user.can_view_confidential or signature.signee.entity_has_public_address %}
                                 {{ signature.signee.address_street_with_number }}<br>
                                 {{ signature.signee.address_zip }} {{ signature.signee.address_district }}<br>
-                                {{ signature.signee.get_address_country_display }}<br>
+                                {{ signature.signee.address_country }}
                             {% else %}
-                                {{ signature.signee.address_district }}<br>
+                                {{ signature.signee.address_district }}, {{ signature.signee.address_country }}
                             {% endif %}
 
                             {% if signature.signee.ico_number %}
-                                IČO: {{ signature.signee.ico_number }}<br>
+                                <br><br>
+                                <strong>IČO</strong>: {{ signature.signee.ico_number }}
                             {% endif %}
 
-                            {% if user.can_view_confidential %}
+                            {% if user.can_view_confidential and signature.signee.date_of_birth %}
+                                <br><br>
+                                <strong>Datum narození</strong>: {{ signature.signee.date_of_birth }}
+                            {% endif %}
+
+                            {% if user.can_view_confidential and not signature.signee.entity_has_public_address %}
                                 </div>
                             {% endif %}
                         </address>