diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemDetailsEditAction.java b/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemDetailsEditAction.java
index 144424e0c43e..22f9260fdefb 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemDetailsEditAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemDetailsEditAction.java
@@ -296,9 +296,10 @@ private boolean applyAddonEntitlementChanges(HttpServletRequest request,
 
                     log.debug("adding entitlement success msg");
                     if (ConfigDefaults.get().isDocAvailable()) {
-                        createSuccessMessage(request,
+                        createMessage(request,
                                 "system.entitle.added." + e.getLabel(),
-                                s.getId().toString());
+                                s.getId().toString(),
+                                GlobalInstanceHolder.USER_PREFERENCE_UTILS.getDocsLocale(user));
                     }
                     else {
                         createSuccessMessage(request,
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml
index cf6859a213dc..7d3c257f3c4c 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml
@@ -9061,7 +9061,7 @@ Alternatively, you will want to download <strong>Incremental Channel Conte
         </context-group>
       </trans-unit>
       <trans-unit id="system.entitle.added.monitoring_entitled" xml:space="preserve">
-        <source>&lt;strong&gt;Monitoring&lt;/strong&gt; type has been applied.&lt;br/&gt;&lt;strong&gt;Note:&lt;/strong&gt; Since you added the Monitoring system type we automatically assigned the Prometheus Exporters formula to the system. Please apply the &lt;a href="/rhn/manager/systems/details/highstate?sid={0}"&gt;Highstate&lt;/a&gt; in order to install and enable the Prometheus metrics exporters.</source>
+        <source>&lt;strong&gt;Monitoring&lt;/strong&gt; type has been applied.&lt;br/&gt;&lt;strong&gt;Note:&lt;/strong&gt; Since you added the Monitoring system type we automatically assigned the Prometheus Exporters formula to the system. Please apply the &lt;a href="/rhn/manager/systems/details/highstate?sid={0}"&gt;Highstate&lt;/a&gt; in order to install and enable the Prometheus metrics exporters.&lt;br/&gt;&lt;strong&gt;Note:&lt;/strong&gt; Please make sure to open the &lt;a href="/docs/{1}/installation-and-upgrade/ports.html#_external_client_ports">required network ports&lt;/a&gt; for all installed exporters.</source>
         <context-group name="ctx">
           <context context-type="sourcefile">/rhn/systems/details/Overview.do</context>
         </context-group>
diff --git a/java/code/src/com/suse/manager/webui/utils/UserPreferenceUtils.java b/java/code/src/com/suse/manager/webui/utils/UserPreferenceUtils.java
index 7dc6c7cc852e..ca70e47c817a 100644
--- a/java/code/src/com/suse/manager/webui/utils/UserPreferenceUtils.java
+++ b/java/code/src/com/suse/manager/webui/utils/UserPreferenceUtils.java
@@ -104,6 +104,16 @@ public String getDocsLocale(PageContext pageContext) {
         HttpServletRequest request = (HttpServletRequest) pageContext.getRequest();
         User user = new RequestContext(request).getCurrentUser();
 
+        return getDocsLocale(user);
+    }
+
+    /**
+     * Get the user's configured documentation locale. If no user is available return the config default
+     *
+     * @param user the current user
+     * @return the users documentation locale
+     */
+    public String getDocsLocale(User user) {
         if (isUserAuthenticated(user)) {
             String locale = user.getPreferredDocsLocale();
             if (locale != null) {
diff --git a/java/spacewalk-java.changes.witek.update_monitoring_added b/java/spacewalk-java.changes.witek.update_monitoring_added
new file mode 100644
index 000000000000..80f5b5551608
--- /dev/null
+++ b/java/spacewalk-java.changes.witek.update_monitoring_added
@@ -0,0 +1 @@
+- Extend success message after adding monitoring property (bsc#1212168)