diff --git a/lib/Travelynx.pm b/lib/Travelynx.pm
index 8ef5fbfe332efe7a57dfe72af599499751a500c3..91de1c695e6b980272e64df211b075b940908a90 100755
--- a/lib/Travelynx.pm
+++ b/lib/Travelynx.pm
@@ -2519,7 +2519,6 @@ sub startup {
 	$r->get('/login')->to('account#login_form');
 	$r->get('/recover')->to('account#request_password_reset');
 	$r->get('/recover/:id/:token')->to('account#recover_password');
-	$r->get('/register')->to('account#registration_form');
 	$r->get('/reg/:id/:token')->to('account#verify');
 	$r->get('/status/:name')->to('traveling#user_status');
 	$r->get('/status/:name/:ts')->to('traveling#user_status');
@@ -2533,9 +2532,13 @@ sub startup {
 	$r->post('/geolocation')->to('traveling#geolocation');
 	$r->post('/list_departures')->to('traveling#redirect_to_station');
 	$r->post('/login')->to('account#do_login');
-	$r->post('/register')->to('account#register');
 	$r->post('/recover')->to('account#request_password_reset');
 
+	if ( not $self->config->{registration}{disabled} ) {
+		$r->get('/register')->to('account#registration_form');
+		$r->post('/register')->to('account#register');
+	}
+
 	my $authed_r = $r->under(
 		sub {
 			my ($self) = @_;
diff --git a/templates/landingpage.html.ep b/templates/landingpage.html.ep
index b7ba22a2301b03183cd5be92ab628146fe632f97..fa9bf8ad08bc3898d9214b0d6d060d7e49b5eea4 100644
--- a/templates/landingpage.html.ep
+++ b/templates/landingpage.html.ep
@@ -112,7 +112,9 @@
 		<div class="col s1 m1 l3">
 		</div>
 		<div class="col s10 m10 l6 center-align">
-			<a href="/register" class="waves-effect waves-light btn"><i class="material-icons left" aria-hidden="true">add</i>Registrieren</a>
+			% if (not app->config->{registration}{disabled}) {
+				<a href="/register" class="waves-effect waves-light btn"><i class="material-icons left" aria-hidden="true">add</i>Registrieren</a>
+			% }
 			<a href="/login" class="waves-effect waves-light btn"><i class="material-icons left" aria-hidden="true">account_circle</i>Anmelden</a>
 		</div>
 		<div class="col s1 m1 l3">