diff --git a/app/controllers/AuthController.php b/app/controllers/AuthController.php
index e0309b8..98e117d 100644
--- a/app/controllers/AuthController.php
+++ b/app/controllers/AuthController.php
@@ -40,6 +40,12 @@ class AuthController {
                     'role' => $user['role'],
                     'role_name' => $user['role_name']
                 ]);
+                
+                if($f3->exists('SESSION.redirect')){
+                    $redirect = $f3->get('SESSION.redirect');
+                    $f3->clear('SESSION.redirect');
+                    $f3->reroute($redirect);
+                }
 
                 $f3->reroute('/dashboard');
             } else {
@@ -49,6 +55,7 @@ class AuthController {
             // if here, login failed.
             $f3->set('SESSION.login_error', 'Invalid username');
         }
+
         $f3->reroute('/login');
         
     }