diff --git a/templates/profile-table.html b/templates/profile-table.html
index de1ad33..2c733f4 100644
--- a/templates/profile-table.html
+++ b/templates/profile-table.html
@@ -33,15 +33,13 @@
{{ request.profile.performance_points|floatformat(0) }}
- {% if not request.profile.is_unlisted %}
-
-
{{_('Rating')}} #
-
{{rating_rank if rating_rank else '-'}}
-
+
{{_('Rating')}} #
+
{{rating_rank if rating_rank and not request.profile.is_unlisted else '-'}}
+
{{_('Points')}} #
-
{{points_rank}}
+
{{points_rank if not request.profile.is_unlisted else '-'}}
{% if awards.medals %}
diff --git a/templates/user/user-about.html b/templates/user/user-about.html
index 69ff3bb..0f2aa45 100644
--- a/templates/user/user-about.html
+++ b/templates/user/user-about.html
@@ -39,18 +39,16 @@
- {% if not user.is_unlisted %}
-
-
-
-
{{rating_rank if rating_rank else '-'}}
-
+
+
+
+
{{rating_rank if rating_rank and not user.is_unlisted else '-'}}
- {% endif %}
+
-
{{points_rank}}
+
{{points_rank if not user.is_unlisted else '-'}}