diff --git a/src/Bundle/ChillPersonBundle/Resources/views/PersonResource/create.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/PersonResource/create.html.twig
index 06c7dd541..6e05f2d6d 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/PersonResource/create.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/PersonResource/create.html.twig
@@ -1,66 +1,6 @@
 <div class="col-md col-xxl">
     <div id="collapseForm" class="collapse">
-        {{ form_start(form, {'attr' : {'id' : 'create-form'}}) }}
-
-        {{ form_row(form.kind) }}
-
-        <div id="linked-entity">
-            <fieldset class="mb-3">
-                <div class="row">
-                    <legend class="col-sm-4 col-form-label">Associer un</legend>
-                    <div class="col-sm-8">
-                        <div id="entity-selector">
-                            <div class="form-check">
-                                <input type="radio" id="chill_personbundle_person_resource_linkedEntity_0" name="linked-entity" class="form-check-input" value="person" />
-                                <label class="form-check-label" for="chill_personbundle_person_resource_linkedEntity_0">Usager</label>
-                            </div>
-                            <div class="form-check">
-                                <input type="radio" id="chill_personbundle_person_resource_linkedEntity_1" name="linked-entity" class="form-check-input" value="thirdparty" />
-                                <label class="form-check-label" for="chill_personbundle_person_resource_linkedEntity_1">Tiers</label>
-                            </div>
-                            <div class="form-check">
-                                <input type="radio" id="chill_personbundle_person_resource_linkedEntity_2" name="linked-entity" class="form-check-input" value="freetext" />
-                                <label class="form-check-label" for="chill_personbundle_person_resource_linkedEntity_2">Description libre</label>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </fieldset>
-        </div>
-
-        <div id="person-entity">
-            {{ form_row(form.person) }}
-        </div>
-        <div id="thirdparty-entity">
-            {{ form_row(form.thirdparty) }}
-        </div>
-        <div id="freetext-entity">
-            {{ form_row(form.freetext) }}
-        </div>
-
-        {{ form_row(form.comment) }}
-
-        {% if action is defined %}
-            <ul class="record_actions sticky-form-buttons">
-                <li class="edit">
-                    <button class="btn btn-edit"
-                    type="submit" id="newPersonResource">
-                        {{ 'edit resource'|trans|capitalize }}
-                    </button>
-                </li>
-            </ul>
-        {% else %}
-            <ul class="record_actions">
-                <li>
-                    <button class="btn btn-create"
-                    type="submit" id="newPersonResource">
-                        {{ 'Save'|trans }}
-                    </button>
-                </li>
-            </ul>
-        {% endif %}
-
-        {{ form_end(form) }}
+        {% include "@ChillPerson/PersonResource/form.html.twig" %}
     </div>
 
     <ul class="record_actions sticky-form-buttons">
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/PersonResource/edit.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/PersonResource/edit.html.twig
index 6aa47228d..652c00ff0 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/PersonResource/edit.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/PersonResource/edit.html.twig
@@ -2,16 +2,22 @@
 
 {% set activeRouteKey = 'chill_person_resource_edit' %}
 
+{% block js %}
+    {{ encore_entry_script_tags('page_person_resource_showhide_input') }}
+    {{ encore_entry_script_tags('mod_pickentity_type') }}
+{% endblock %}
+
+{% block css %}
+    {{ encore_entry_link_tags('page_person_resource_showhide_input') }}
+    {{ encore_entry_link_tags('mod_pickentity_type') }}
+{% endblock %}
+
 {% block title %}{{ 'edit resource'|trans|capitalize }}{% endblock %}
 
 {% block personcontent %}
 
 <h1 style="margin-bottom: 2rem;">{{ 'edit resource'|trans }}</h1>
 
-{% include "@ChillPerson/PersonResource/create.html.twig" %}
+{% include "@ChillPerson/PersonResource/form.html.twig" %}
 
 {% endblock %}
-
-{% block js %}
-    {{ encore_entry_script_tags('page_person_resource') }}
-{% endblock %}
\ No newline at end of file
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/PersonResource/form.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/PersonResource/form.html.twig
new file mode 100644
index 000000000..1074e960f
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Resources/views/PersonResource/form.html.twig
@@ -0,0 +1,63 @@
+{{ form_start(form, {'attr' : {'id' : 'create-form'}}) }}
+
+{{ form_row(form.kind) }}
+
+    <div id="linked-entity">
+        <fieldset class="mb-3">
+            <div class="row">
+                <legend class="col-sm-4 col-form-label">Associer un</legend>
+                <div class="col-sm-8">
+                    <div id="entity-selector">
+                        <div class="form-check">
+                            <input type="radio" id="chill_personbundle_person_resource_linkedEntity_0" name="linked-entity" class="form-check-input" value="person" />
+                            <label class="form-check-label" for="chill_personbundle_person_resource_linkedEntity_0">Usager</label>
+                        </div>
+                        <div class="form-check">
+                            <input type="radio" id="chill_personbundle_person_resource_linkedEntity_1" name="linked-entity" class="form-check-input" value="thirdparty" />
+                            <label class="form-check-label" for="chill_personbundle_person_resource_linkedEntity_1">Tiers</label>
+                        </div>
+                        <div class="form-check">
+                            <input type="radio" id="chill_personbundle_person_resource_linkedEntity_2" name="linked-entity" class="form-check-input" value="freetext" />
+                            <label class="form-check-label" for="chill_personbundle_person_resource_linkedEntity_2">Description libre</label>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </fieldset>
+    </div>
+
+
+    <div id="person-entity">
+        {{ form_row(form.person) }}
+    </div>
+    <div id="thirdparty-entity">
+        {{ form_row(form.thirdparty) }}
+    </div>
+    <div id="freetext-entity">
+        {{ form_row(form.freetext) }}
+    </div>
+
+
+{{ form_row(form.comment) }}
+
+{% if action is defined %}
+    <ul class="record_actions sticky-form-buttons">
+        <li class="edit">
+            <button class="btn btn-edit"
+            type="submit" id="newPersonResource">
+                {{ 'edit resource'|trans|capitalize }}
+            </button>
+        </li>
+    </ul>
+{% else %}
+    <ul class="record_actions">
+        <li>
+            <button class="btn btn-create"
+            type="submit" id="newPersonResource">
+                {{ 'Save'|trans }}
+            </button>
+        </li>
+    </ul>
+{% endif %}
+
+{{ form_end(form) }}
\ No newline at end of file
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/PersonResource/list.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/PersonResource/list.html.twig
index cb542b6a1..50aeb96e2 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/PersonResource/list.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/PersonResource/list.html.twig
@@ -59,7 +59,7 @@
                         </div>
                     </div>
                 </div>
-                {% if resource.kind %}
+                {% if resource.comment.comment is not null %}
                     <div class="item-row separator">
                         <section class="chill-entity entity-comment-embeddable">
                             <blockquote class="chill-user-quote">