diff --git a/templates/status/status-members-field-macros.html b/templates/status/status-members-field-macros.html
index 0cbe3646062e8f0e5abc5858b6ec658dfbb79622..d1d5044efce2b1b290a89c3aaa502510d0390112 100644
--- a/templates/status/status-members-field-macros.html
+++ b/templates/status/status-members-field-macros.html
@@ -14,10 +14,19 @@
 
 {% macro certificate(field) %}
 	{% import _self as display %}
-	{% set field_value = field.value[0] ? field.value[0] : field.value %}
-	{{ display.string_internal(field.display_title, field_value, field.data_missing, field.supress_highlight) }}
+        {% set field_title =  field.value[1] ? field.display_title ~ 's' : field.display_title %}
+	{% set field_value =  field.value[0] ? display.get_certificates(field.value) : field.value %}
+	{{ display.string_internal(field_title, field_value, field.data_missing, field.supress_highlight) }}
 {% endmacro %}
 
+{% macro get_certificates(certs) %}
+	{% import _self as display %}
+	{% for cert in certs %}
+		{{ cert }}<br />
+	{% endfor %}        
+{% endmacro %}
+
+
 {% macro boolean(field) %}
 	{% import _self as display %}
 	{% set display_value = field.data_missing ? field.value : (field.value ? 'yes' : 'no') %}
@@ -25,8 +34,6 @@
 {% endmacro %}
 
 
-
-
 {% macro federation_stats(field) %}
 	{% import _self as display %}
 	{% set display_value = field.data_missing ? field.value : display.get_federation_stats(field.value) %}