diff --git a/app/Resources/views/beneficiary/_partial/address.html.twig b/app/Resources/views/beneficiary/_partial/address.html.twig
new file mode 100644
index 000000000..feddb16e9
--- /dev/null
+++ b/app/Resources/views/beneficiary/_partial/address.html.twig
@@ -0,0 +1,8 @@
+{{ address.street1 }}
+{% if address.street2 %}
+    {{ address.street2 }}
+{% endif %}
+{% if address.zipCode %}
+    {{ "%d"|format(address.zipCode) }}
+{% endif %}
+{{ address.city }}
diff --git a/app/Resources/views/beneficiary/_partial/info.html.twig b/app/Resources/views/beneficiary/_partial/info.html.twig
index 0ac247176..236b19643 100644
--- a/app/Resources/views/beneficiary/_partial/info.html.twig
+++ b/app/Resources/views/beneficiary/_partial/info.html.twig
@@ -50,12 +50,7 @@
         {% if beneficiary.address %}
             <div class="col s12">
                 <i class="material-icons tiny">location_on</i>
-                {{ beneficiary.address.street1 }}
-                {% if beneficiary.address.street2 %}
-                    {{ beneficiary.address.street2 }}
-                {% endif %}
-                {{ "%d"|format(beneficiary.address.zipCode) }}
-                {{ beneficiary.address.city }}
+                {% include "beneficiary/_partial/address.html.twig" with { address: beneficiary.address } %}
             </div>
         {% endif %}
     {% endif %}