diff --git a/lib/Travelynx.pm b/lib/Travelynx.pm
index 94a7c49b005f1247ca3553445d19dea705ac6b5f..44273e5127f546ad3d83926690a4f1d805dee15c 100755
--- a/lib/Travelynx.pm
+++ b/lib/Travelynx.pm
@@ -2906,7 +2906,7 @@ sub startup {
 	$authed_r->post('/account/insight')->to('account#insight');
 	$authed_r->post('/journey/add')->to('traveling#add_journey_form');
 	$authed_r->post('/journey/edit')->to('traveling#edit_journey');
-	$authed_r->post('/journey/passenger_rights')
+	$authed_r->post('/journey/passenger_rights/*filename')
 	  ->to('passengerrights#generate');
 	$authed_r->post('/account/password')->to('account#change_password');
 	$authed_r->post('/account/mail')->to('account#change_mail');
diff --git a/templates/journey.html.ep b/templates/journey.html.ep
index 440eec66c4e4f212f8268961c65b4efa208b1bc4..9b7ad9c419331445a8ccd6cfa0c65fd3dd960ddd 100644
--- a/templates/journey.html.ep
+++ b/templates/journey.html.ep
@@ -33,7 +33,8 @@
 			% }
 			% if ($journey->{cancelled} or ($journey->{rt_arrival} and ($journey->{rt_arrival}->epoch - $journey->{sched_arrival}->epoch) >= 3600)) {
 				<div style="text-align: center; margin-bottom: 1em;">
-					%= form_for 'journeypassenger_rights' => begin
+					% my $form_target = sprintf('/journey/passenger_rights/FGR %s %s %s.pdf', $journey->{sched_departure}->ymd, $journey->{type}, $journey->{no});
+					%= form_for $form_target => (method => 'POST') => begin
 						%= csrf_field
 						%= hidden_field id => $journey->{id}
 						<button class="btn waves-effect waves-light grey darken-3" type="submit" name="action" value="generate">