diff --git a/.dev_env b/.dev_env
index 6095581253c447ed5079c3961056d2f1df07e7fa..047251e08b7a7d49b0f158ab461ecd6690b85d4e 100644
--- a/.dev_env
+++ b/.dev_env
@@ -2,4 +2,4 @@ DATABASE_URL=postgresql://jughisto@database/jughisto
 SECRET_HASH_KEY=rhdFVrOAq/wEyVw9MsmV8MSvGBj0AotAUTHs2yEs+zBlvcMRsfflUc73WgY30SRpH4Djvr60IXhM71MRiLUu9g==
 IDENTITY_SECRET_KEY=Ltg58gY6DD/g0+P+Jl5s5W24qA4R6gM19mE/6rQEGEm9VGlY7DqGEeEuEc1leOeyLdgUPa+cNZ7NigPu7de8LA==
 TZ=America/Sao_Paulo
-BASE_URL=/jughisto/
+BASE_URL=
diff --git a/src/main.rs b/src/main.rs
index 87b7751385704619fcbef82ba75090e46eb60525..4172ee18697cae07eb0ea86918340a6c579f1fbc 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -195,7 +195,7 @@ async fn main() -> Result<(), Box<dyn Error>> {
             .app_data(broadcaster.clone())
             .app_data(handlebars_ref.clone())
             .service(
-                web::scope("/jughisto")
+                web::scope(&env::var("BASE_URL").expect("BASE_URL variable is not set"))
                     .service(pages::get_login::get_login)
                     .service(pages::get_me::get_me)
                     .service(pages::change_password::change_password)
diff --git a/src/pages/prelude.rs b/src/pages/prelude.rs
index 5323fa2833b0e6e11387ffc99ed9c90e19d649dc..30b588340de8fff9e7e24519caabac2b5a924ce7 100644
--- a/src/pages/prelude.rs
+++ b/src/pages/prelude.rs
@@ -152,7 +152,7 @@ pub fn redirect_to_referer(message: String, request: &HttpRequest) -> HttpRespon
         .get("Referer")
         .and_then(|h| h.to_str().ok())
         .map_or_else(
-            || env::var("BASE_URL").expect("BASE_URL environment variable is not set"),
+            || env::var("BASE_URL").expect("BASE_URL environment variable is not set") + "/",
             std::convert::Into::into,
         );
     FlashMessage::info(message).send();
@@ -166,7 +166,7 @@ pub fn redirect_to_root() -> HttpResponse {
         .append_header((
             header::LOCATION,
             HeaderValue::from_str(
-                &env::var("BASE_URL").expect("BASE_URL environment variable is not set"),
+                &(env::var("BASE_URL").expect("BASE_URL environment variable is not set") + "/"),
             )
             .unwrap(),
         ))