diff --git a/config.yaml b/config.yaml
index a144890..cddab5e 100644
--- a/config.yaml
+++ b/config.yaml
@@ -32,6 +32,7 @@ views:
     update:
       files:
         - web/layouts/_partials/address_autocomplete.html
+        - web/layouts/agenda/_partials/address.html
         - web/layouts/beneficiaries/update.html
   members:
     display:
diff --git a/web/layouts/beneficiaries/update.html b/web/layouts/beneficiaries/update.html
index da1b4c9..eacda1c 100644
--- a/web/layouts/beneficiaries/update.html
+++ b/web/layouts/beneficiaries/update.html
@@ -162,9 +162,13 @@
                 </div>
                 <div class="mt-5 space-y-6 md:mt-0 md:col-span-2">
 
-                    {{ $fieldName := "address" }}
-                    {{ template "address_autocomplete" (dict "FieldName" $fieldName "Address" .ViewState.Data.address) }}
-                    <!-- will dolater : tags, groups, ... -->
+                        {{ $fieldName := "address" }} 
+                        {{if .ViewState.Data.address}}
+                        {{$default := .ViewState.Data.address}}
+                        {{ template "address" dict "FieldName" $fieldName  "Default" $default}}
+                        {{else}}
+                        {{ template "address_autocomplete" dict "FieldName" $fieldName}}
+                        {{end}}
 
                 </div>
             </div>