diff --git a/tinyfilemanager.php b/tinyfilemanager.php
index 1dbad3d..c14db5d 100644
--- a/tinyfilemanager.php
+++ b/tinyfilemanager.php
@@ -298,11 +298,11 @@ if ($use_auth) {
             if (isset($auth_users[$_POST['fm_usr']]) && isset($_POST['fm_pwd']) && password_verify($_POST['fm_pwd'], $auth_users[$_POST['fm_usr']])) {
                 $_SESSION[FM_SESSION_ID]['logged'] = $_POST['fm_usr'];
                 fm_set_msg(lng('You are logged in'));
-                fm_redirect(FM_SELF_URL . '?p=');
+                fm_redirect(FM_SELF_URL . $_SERVER[REQUEST_URI]);
             } else {
                 unset($_SESSION[FM_SESSION_ID]['logged']);
                 fm_set_msg(lng('Login failed. Invalid username or password'), 'error');
-                fm_redirect(FM_SELF_URL);
+                fm_redirect(FM_SELF_URL . $_SERVER[REQUEST_URI]);
             }
         } else {
             fm_set_msg(lng('password_hash not supported, Upgrade PHP version'), 'error');;