diff --git a/templates/_checked_in.html.ep b/templates/_checked_in.html.ep
index b8c8c6b..2d39842 100644
--- a/templates/_checked_in.html.ep
+++ b/templates/_checked_in.html.ep
@@ -278,7 +278,7 @@
 					% if ($journey->{real_arrival}->epoch and $journey_visibility eq 'private') {
 						% $arr_text = $journey->{real_arrival}->strftime(' – Ankunft gegen %H:%M Uhr');
 					% }
-					% if ($user->{is_public} & 0x80 and $journey->{comment}) {
+					% if ($user->{comments_visible} and $journey->{comment}) {
 						data-text="<%= $journey->{comment} %> (@ <%= $journey->{train_type} %> <%= $journey->{train_no} %> → <%= $journey->{arr_name} %>) #travelynx"
 					% }
 					% else {
diff --git a/templates/edit_comment.html.ep b/templates/edit_comment.html.ep
index 81353a2..4f8e3e4 100644
--- a/templates/edit_comment.html.ep
+++ b/templates/edit_comment.html.ep
@@ -29,7 +29,7 @@
 					am
 					<b><%= $journey->{sched_departure}->strftime('%d.%m.%Y') %></b>
 				</p>
-				% if (current_user()->{is_public} & 0x04) {
+				% if (current_user()->{comments_visible}) {
 					<p>
 						Der hier eingetragene Text ist als Teil deines Nutzerstatus
 						öffentlich sichtbar.