diff --git a/src/modules/static-front-end/login/login.controller.ts b/src/modules/static-front-end/login/login.controller.ts
index 4673daa..d4ff92a 100644
--- a/src/modules/static-front-end/login/login.controller.ts
+++ b/src/modules/static-front-end/login/login.controller.ts
@@ -84,7 +84,7 @@ export class LoginController {
       const encrypted = await this.token.encryptChallenge(challenge);
       res.redirect(
         `login/verify?challenge=${encrypted}${
-          redirectTo ? '&redirectTo=' + redirectTo : ''
+          redirectTo ? '&redirectTo=' + encodeURIComponent(redirectTo) : ''
         }`,
       );
       return;
@@ -114,7 +114,10 @@ export class LoginController {
       });
 
       res.redirect(
-        '/login' + (query.redirectTo ? '?redirectTo=' + query.redirectTo : ''),
+        '/login' +
+          (query.redirectTo
+            ? '?redirectTo=' + encodeURIComponent(query.redirectTo)
+            : ''),
       );
       return;
     }
@@ -156,7 +159,10 @@ export class LoginController {
       });
 
       res.redirect(
-        '/login' + (query.redirectTo ? '?redirectTo=' + query.redirectTo : ''),
+        '/login' +
+          (query.redirectTo
+            ? '?redirectTo=' + encodeURIComponent(query.redirectTo)
+            : ''),
       );
       return;
     }