diff --git a/group_vars/all/management.yml b/group_vars/all/management.yml
index 1933ee0..3e33c8e 100644
--- a/group_vars/all/management.yml
+++ b/group_vars/all/management.yml
@@ -16,6 +16,7 @@ management_configurations:
 
 connect_workflow_env:
   - "stage:{{ stage }}"
+  - "baseUrl:{{ http_s }}://{{ connect_base_url }}"
   - "managementHostname:{{ shared_service_host_management }}"
   - "kibanaHostname:{{ shared_service_hostname_kibana }}"
   - "keycloakHostname:{{ shared_service_hostname_keycloak }}"
diff --git a/group_vars/connect/plain.yml b/group_vars/connect/plain.yml
index 4905fe8..8cdd469 100644
--- a/group_vars/connect/plain.yml
+++ b/group_vars/connect/plain.yml
@@ -27,8 +27,8 @@ connect_oidc_client_secret: "{{ cluster_name }}"
 connect_oidc_registration_id: "{{ cluster_name }}"
 connect_oidc_issuer_uri: "https://{{ shared_service_hostname_keycloak }}/auth/realms/{{ current_realm_name }}"
 
-connect_password_change_url: "{{ http_s }}://{{ shared_service_hostname_keycloak }}/auth/realms/{{ current_realm_name }}/account/password"
-connect_iam_user_management_url: "{{ http_s }}://{{ shared_service_hostname_keycloak }}/auth/admin/{{ current_realm_name }}/console"
+connect_password_change_url: "{{ http_s }}://{{ shared_service_hostname_keycloak }}/auth/realms/{{ current_realm_name }}/account/?referrer=security-admin-console#/security/signingin"
+connect_user_management_url: "{{ http_s }}://{{ shared_service_hostname_keycloak }}/auth/admin/{{ current_realm_name }}/console"
 
 connect_mail_properties_simulation: false
 
diff --git a/roles/connect/vars/main.yml b/roles/connect/vars/main.yml
index ad53aba..d3b47be 100644
--- a/roles/connect/vars/main.yml
+++ b/roles/connect/vars/main.yml
@@ -72,7 +72,7 @@ connect_environment: [
   "OIDC_REGISTRATION_ID: \"{{ connect_oidc_registration_id | default('oidc_config_not_found') }}\"",
   "OIDC_ISSUER_URI: \"{{ connect_oidc_issuer_uri | default('oidc_config_not_found') }}\"",
   "PASSWORD_CHANGE_URL: \"{{ connect_password_change_url | default('') }}\"",
-  "USER_MANAGEMENT_URL: \"{{ connect_iam_user_management_url | default('') }}\"",
+  "USER_MANAGEMENT_URL: \"{{ connect_user_management_url | default('') }}\"",
 
   "IAM_MODULE: \"{{ connect_iam_module | default('embedded') }}\"",
   "IAM_CLIENT_ENABLED: \"{{ smardigo_iam_client_enabled | default('false') }}\"",