diff --git a/apps/participation/templates/participation/participation_detail.html b/apps/participation/templates/participation/participation_detail.html
index 878292b..a584bbe 100644
--- a/apps/participation/templates/participation/participation_detail.html
+++ b/apps/participation/templates/participation/participation_detail.html
@@ -21,7 +21,7 @@
                 <dl class="row">
                     {% trans "No video sent" as novideo %}
                     <dt class="col-sm-2">{% trans "Proposed solution:" %}</dt>
-                    <dd class="col-sm-10"><a href="{{ participation.solution.link|default:"#" }}" target="_blank">
+                    <dd class="col-sm-10"><a href="{{ participation.solution.link|default:"#" }}"{% if participation.solution.link %} target="_blank"{% endif %}>
                         {{ participation.solution.link|default:novideo }}</a>
                         {% if current_phase.phase_number == 1 or participation.solution.link == "" %}
                             <button class="btn btn-primary" data-toggle="modal" data-target="#uploadSolutionModal">{% trans "Upload" %}</button>
@@ -94,6 +94,14 @@
                                 <button class="btn btn-primary" data-toggle="modal" data-target="#defineReceivedParticipationModal">{% trans "Change" %}</button>
                             </dd>
                         {% endif %}
+
+                        <dt class="col-xl-5">{% trans "Proposed solution:" %}</dt>
+                        <dd class="col-sm-7"><a href="{{ participation.received_participation.solution.link|default:"#" }}"{% if participation.received_participation.solution.link %} target="_blank"{% endif %}>
+                            {{ participation.received_participation.solution.link|default:novideo }}</a>
+                            {% if participation.received_participation.solution.link %}
+                                <button class="btn btn-info" data-toggle="modal" data-target="#displaySolutionModal">{% trans "Display" %}</button>
+                            {% endif %}
+                        </dd>
                     </dl>
 
                     {# TODO Display solution #}
@@ -139,6 +147,15 @@
 {% trans "Display solution" as modal_title %}
 {% trans "This video platform is not supported yet." as unsupported_platform %}
 {% include "base_modal.html" with modal_id="displaySolution" modal_action="" modal_button="" modal_additional_class="modal-lg" modal_content=participation.solution.as_iframe|default:unsupported_platform %}
+
+
+{% if user.registration.is_admin or current_phase.phase_number >= 2 %}
+    {% if participation.received_participation.solution.link %}
+        {% trans "Display solution" as modal_title %}
+        {% trans "This video platform is not supported yet." as unsupported_platform %}
+        {% include "base_modal.html" with modal_id="displaySolution" modal_action="" modal_button="" modal_additional_class="modal-lg" modal_content=participation.received_participation.solution.as_iframe|default:unsupported_platform %}
+    {% endif %}
+{% endif %}
 {% endblock %}
 
 {% block extrajavascript %}