diff --git a/src/Application/Login.php b/src/Application/Login.php
index b2eadbe..e70e27c 100644
--- a/src/Application/Login.php
+++ b/src/Application/Login.php
@@ -36,17 +36,21 @@ class Login
         $app->post('/login', function ($request, $response, $args) {
             // Render index view
             $post = $request->getParsedBody();
+            $query = $request->getQueryParams();
+            $redirect = $query['redirect'];
 
             try {
                 $resp = $this->auth->login($post['rekeningnr'], $post['pascode']);
 
-                if ($resp) {
-                    return Redirect::create($request, $response, '/');
+                if ($resp && $redirect !== "") {
+                    return Redirect::create($request, $response, $redirect);
+                } elseif ($resp) {
+                    return Redirect::create($request, $response, '/rekeningen');
                 } else {
-                    return Redirect::create($request, $response, '/login?error');
+                    return Redirect::create($request, $response, '/login?error&redirect='.$redirect);
                 }
             } catch (\Exception $e) {
-                return Redirect::create($request, $response, '/login?error');
+                return Redirect::create($request, $response, '/login?error&redirect='.$redirect);
             }
         });
 
diff --git a/templates/login.phtml b/templates/login.phtml
index 34ee8c0..1b3c39e 100644
--- a/templates/login.phtml
+++ b/templates/login.phtml
@@ -26,8 +26,9 @@
                     <?php if ($error) {
     ?>
                         <div class="alert alert-warning" role="alert">De ingevulde gegevens zijn incorrect. Probeer het opnieuw.</div><br/>
-                    <?php 
-} ?>                    
+                    <?php
+
+} ?>
 				  <form method="post" action="">
 					<input type="text" name="rekeningnr" placeholder="Rekeningnummer (alleen cijfers)">
 					<input type="password" name="pascode" placeholder="Pascode">