diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/index.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/index.html.twig
index 494212bcd..77b075a82 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/index.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/index.html.twig
@@ -23,31 +23,31 @@
+ {% if 'DRAFT' == accompanyingCourse.step %}
{% include '@ChillPerson/AccompanyingCourse/_still_draft.html.twig' %}
- {% if 'DRAFT' == accompanyingCourse.step %}
{% endif %}
+ {% if 'DRAFT' != accompanyingCourse.step %}
+ {% if withoutHousehold|length > 0 %}
{% include '@ChillPerson/AccompanyingCourse/_join_household.html.twig' %}
- {% if 'DRAFT' != accompanyingCourse.step %}
- {% if withoutHousehold|length > 0 %}
{% endif %}
{% endif %}
+ {% if accompanyingCourse.locationStatus == 'address'
+ or accompanyingCourse.locationStatus == 'none' %}
{% include '@ChillPerson/AccompanyingCourse/_warning_address.html.twig' %}
- {% if accompanyingCourse.locationStatus == 'address'
- or accompanyingCourse.locationStatus == 'none' %}
{% endif %}