diff --git a/lib/Travelynx/Controller/Traveling.pm b/lib/Travelynx/Controller/Traveling.pm
index f1f689b0e5d5368a6f2240eadd7f9106c31c5999..9f00f9d63726fb63fb8cbf843dd4dddc0a2771b9 100755
--- a/lib/Travelynx/Controller/Traveling.pm
+++ b/lib/Travelynx/Controller/Traveling.pm
@@ -521,17 +521,21 @@ sub user_status {
 	{
 		for my $candidate (
 			$self->journeys->get(
-				uid   => $user->{id},
-				limit => 20,
+				uid          => $user->{id},
+				sched_dep_ts => $ts,
+				limit        => 1,
 			)
 		  )
 		{
-			if ( $candidate->{sched_dep_ts} eq $ts ) {
-
-				# TODO pass token
+			my $token = $self->param('token');
+			if ($token) {
+				$self->redirect_to(
+					"/p/${name}/j/$candidate->{id}?token=${token}-${ts}");
+			}
+			else {
 				$self->redirect_to("/p/${name}/j/$candidate->{id}");
-				return;
 			}
+			return;
 		}
 		$self->render('not_found');
 		return;