diff --git a/templates/part.property.php b/templates/part.property.php
index 9e2a5cab..d0d2b773 100644
--- a/templates/part.property.php
+++ b/templates/part.property.php
@@ -44,13 +44,27 @@
 			<?php endif; ?>
 		</td>
 		<td class="contacts_details_right">
+			<?php if(!empty($_['property']['value'][0])): ?>
 			<?php echo $l->t('PO Box'); ?> <?php echo $_['property']['value'][0]; ?><br>
+			<?php endif; ?>
+			<?php if(!empty($_['property']['value'][1])): ?>
 			<?php echo $l->t('Extended Address'); ?> <?php echo $_['property']['value'][1]; ?><br>
+			<?php endif; ?>
+			<?php if(!empty($_['property']['value'][2])): ?>
 			<?php echo $l->t('Street Name'); ?> <?php echo $_['property']['value'][2]; ?><br>
+			<?php endif; ?>
+			<?php if(!empty($_['property']['value'][3])): ?>
 			<?php echo $l->t('City'); ?> <?php echo $_['property']['value'][3]; ?><br>
+			<?php endif; ?>
+			<?php if(!empty($_['property']['value'][4])): ?>
 			<?php echo $l->t('Region'); ?> <?php echo $_['property']['value'][4]; ?><br>
+			<?php endif; ?>
+			<?php if(!empty($_['property']['value'][5])): ?>
 			<?php echo $l->t('Postal Code'); ?> <?php echo $_['property']['value'][5]; ?><br>
+			<?php endif; ?>
+			<?php if(!empty($_['property']['value'][6])): ?>
 			<?php echo $l->t('Country'); ?> <?php echo $_['property']['value'][6]; ?> 
+			<?php endif; ?>
 			<span style="display:none;" data-use="edit"><img class="svg action" src="<?php echo image_path('', 'actions/rename.svg'); ?>" /></span>
 			<span style="display:none;" data-use="delete"><img class="svg action" src="<?php echo image_path('', 'actions/delete.svg'); ?>" /></span>
 		</td>