diff --git a/services/src/main/java/org/keycloak/services/resources/account/AccountConsole.java b/services/src/main/java/org/keycloak/services/resources/account/AccountConsole.java
index 0973df958cc6..03d2f8fb8bb0 100644
--- a/services/src/main/java/org/keycloak/services/resources/account/AccountConsole.java
+++ b/services/src/main/java/org/keycloak/services/resources/account/AccountConsole.java
@@ -93,14 +93,13 @@ public Response getMainPage() throws IOException, FreeMarkerException {
         } else {
             Map<String, Object> map = new HashMap<>();
 
-            URI adminBaseUri = session.getContext().getUri(UrlType.ADMIN).getBaseUri();
             URI authUrl = uriInfo.getBaseUri();
             map.put("authUrl", authUrl.getPath().endsWith("/") ? authUrl : authUrl + "/");
             map.put("baseUrl", accountBaseUrl);
             map.put("realm", realm);
             map.put("clientId", Constants.ACCOUNT_CONSOLE_CLIENT_ID);
             map.put("resourceUrl", Urls.themeRoot(authUrl).getPath() + "/" + Constants.ACCOUNT_MANAGEMENT_CLIENT_ID + "/" + theme.getName());
-            map.put("resourceCommonUrl", Urls.themeRoot(adminBaseUri).getPath() + "/common/keycloak");
+            map.put("resourceCommonUrl", Urls.themeRoot(authUrl).getPath() + "/common/keycloak");
             map.put("resourceVersion", Version.RESOURCES_VERSION);
             
             String[] referrer = getReferrer();