diff --git a/docs/documentation/server_development/topics/themes.adoc b/docs/documentation/server_development/topics/themes.adoc
index 668fc06665..01faaa7dac 100755
--- a/docs/documentation/server_development/topics/themes.adoc
+++ b/docs/documentation/server_development/topics/themes.adoc
@@ -126,6 +126,7 @@ Theme properties are set in the file `<THEME TYPE>/theme.properties` in the them
 
 * parent - Parent theme to extend
 * import - Import resources from another theme
+* common - Override the common resource path. The default value is `common/keycloak` when not specified. This value would be used as value of suffix of `${url.resourcesCommonPath}`, which is used typically in freemarker templates (prefix of `${url.resoucesCommonPath}` value is theme root uri).
 * styles - Space-separated list of styles to include
 * locales - Comma-separated list of supported locales
 
diff --git a/services/src/main/java/org/keycloak/forms/login/freemarker/model/UrlBean.java b/services/src/main/java/org/keycloak/forms/login/freemarker/model/UrlBean.java
index 1a48eb7e7f..154dccd3d7 100755
--- a/services/src/main/java/org/keycloak/forms/login/freemarker/model/UrlBean.java
+++ b/services/src/main/java/org/keycloak/forms/login/freemarker/model/UrlBean.java
@@ -132,12 +132,12 @@ public class UrlBean {
         URI uri = getThemeRootUri();
         String commonPath = "";
         try {
-            commonPath = theme.getProperties().getProperty("import");
+            commonPath = theme.getProperties().getProperty("common");
         } catch (IOException ex) {
             logger.warn("Failed to load properties", ex);
         }
         if (commonPath == null || commonPath.isEmpty()) {
-            commonPath = "/common/keycloak";
+            commonPath = "common/keycloak";
         }
         return uri.getPath() + "/" + commonPath;
     }