diff --git a/ui-ngx/src/app/modules/login/pages/login/login.component.ts b/ui-ngx/src/app/modules/login/pages/login/login.component.ts
index afe029791b..5f83872261 100644
--- a/ui-ngx/src/app/modules/login/pages/login/login.component.ts
+++ b/ui-ngx/src/app/modules/login/pages/login/login.component.ts
@@ -78,7 +78,7 @@ export class LoginComponent extends PageComponent implements OnInit {
   getOAuth2Uri(oauth2Client: OAuth2ClientLoginInfo): string {
     let result = "";
     if (this.authService.redirectUrl) {
-      result += "?prevUri=" + this.authService.redirectUrl;
+      result += "?prevUri=" + encodeURIComponent(this.authService.redirectUrl);
     }
     return oauth2Client.url + result;
   }