diff --git a/npm/ng-packs/packages/account/src/lib/guards/manage-profile.guard.ts b/npm/ng-packs/packages/account/src/lib/guards/manage-profile.guard.ts
index ca840bd913..4a5b5a0709 100644
--- a/npm/ng-packs/packages/account/src/lib/guards/manage-profile.guard.ts
+++ b/npm/ng-packs/packages/account/src/lib/guards/manage-profile.guard.ts
@@ -9,7 +9,7 @@ export class ManageProfileGuard implements CanActivate {
   canActivate(_: ActivatedRouteSnapshot, __: RouterStateSnapshot) {
     const env = this.configState.getEnvironment();
     if (env.oAuthConfig.responseType === 'code') {
-      window.open(`${env.oAuthConfig.issuer}/Account/Manage`, '_blank');
+      window.location.href = `${env.oAuthConfig.issuer}/Account/Manage?returnUrl=${window.location.href}`;
       return false;
     } else {
       return true;