diff --git a/core/templates/core/user_detail.jinja b/core/templates/core/user_detail.jinja
index 0870369c..25a31c20 100644
--- a/core/templates/core/user_detail.jinja
+++ b/core/templates/core/user_detail.jinja
@@ -119,7 +119,25 @@
{{ user_subscription(profile) }}
-
+ {% endif %}
+ {% if user == profile or user.is_root or user.is_board_member or user.is_launderette_manager %}
+
+ {# Shows tokens bought by the user #}
+ {{ show_tokens(profile) }}
+ {# Shows slots took by the user #}
+ {{ show_slots(profile) }}
+
+ {% endif %}
+ {% else %}
+
+ {% endif %}
+ {% if profile.was_subscribed and (user == profile or user.is_root or user.is_board_member)%}
{% trans %}Subscription history{% endtrans %}
@@ -139,23 +157,6 @@
{% endfor %}
- {% endif %}
- {% if user == profile or user.is_root or user.is_board_member or user.is_launderette_manager %}
-
- {# Shows tokens bought by the user #}
- {{ show_tokens(profile) }}
- {# Shows slots took by the user #}
- {{ show_slots(profile) }}
-
- {% endif %}
- {% else %}
-
{% endif %}
{% if user.is_root or user.is_board_member %}