diff --git a/templates/_checked_in.html.ep b/templates/_checked_in.html.ep
index 2382ac4..2e8b163 100644
--- a/templates/_checked_in.html.ep
+++ b/templates/_checked_in.html.ep
@@ -1,7 +1,4 @@
 % my $user = current_user();
-% if (@{stash('timeline') // []}) {
-	%= include '_timeline_link', timeline => stash('timeline')
-% }
 <div class="autorefresh">
 	<div class="card">
 		<div class="card-content">
@@ -304,6 +301,9 @@
 			% }
 		</div>
 	</div>
+	% if (@{stash('timeline') // []}) {
+		%= include '_timeline_link', timeline => stash('timeline'), from_checkin => 1
+	% }
 	% if ($journey->{arr_name}) {
 		<div class="card" style="margin-top: 3em;">
 			<div class="card-content">
diff --git a/templates/_timeline_link.html.ep b/templates/_timeline_link.html.ep
index 782906e..a4d0f97 100644
--- a/templates/_timeline_link.html.ep
+++ b/templates/_timeline_link.html.ep
@@ -4,13 +4,13 @@
 		<strong><%= $timeline->[0]->{followee_name} %></strong>
 	% }
 	% if (@{$timeline} == 1) {
-		ist gerade unterwegs
+		ist gerade <%= stash('from_checkin') ? 'auch' : q{} %> unterwegs
 	% }
 	% elsif (@{$timeline} == 2) {
-		und <strong><%= $timeline->[1]->{followee_name} %></strong> sind gerade unterwegs
+		und <strong><%= $timeline->[1]->{followee_name} %></strong> sind gerade <%= stash('from_checkin') ? 'auch' : q{} %>unterwegs
 	% }
 	% else {
-		<strong><%= scalar @{$timeline} %></strong> Accounts sind gerade unterwegs
+		<strong><%= scalar @{$timeline} %></strong> Accounts sind gerade <%= stash('from_checkin') ? 'auch' : q{} %>unterwegs
 	% }
 	</a>
 </div>