diff --git a/webadmin/src/js/index.js b/webadmin/src/js/index.js
index 129537742..89eb796a0 100644
--- a/webadmin/src/js/index.js
+++ b/webadmin/src/js/index.js
@@ -235,6 +235,21 @@ app.filter('markdown2html', function () {
     };
 });
 
+app.filter('postInstallMessage', function () {
+    var SSO_MARKER = '=== sso ===';
+
+    return function (text, app) {
+        if (!app) return text;
+
+        var parts = text.split(SSO_MARKER);
+        if (parts.length === 1) return text;
+
+        if (app.sso) return parts[1];
+        else return parts[0];
+    };
+});
+
+
 // keep this in sync with eventlog.js
 var ACTION_ACTIVATE = 'cloudron.activate';
 var ACTION_APP_CONFIGURE = 'app.configure';
diff --git a/webadmin/src/views/apps.html b/webadmin/src/views/apps.html
index ba2d1b745..19a2962f7 100644
--- a/webadmin/src/views/apps.html
+++ b/webadmin/src/views/apps.html
@@ -220,7 +220,7 @@
             </div>
             <div class="modal-body">
                 <div class="app-postinstall-message">
-                    <div ng-bind-html="appPostInstall.message | markdown2html"></div>
+                    <div ng-bind-html="appPostInstall.message | postInstallMessage:appPostInstall.app | markdown2html"></div>
                 </div>
             </div>
             <div class="modal-footer">
diff --git a/webadmin/src/views/appstore.html b/webadmin/src/views/appstore.html
index e64bb2a2b..37fc1ea0f 100644
--- a/webadmin/src/views/appstore.html
+++ b/webadmin/src/views/appstore.html
@@ -124,7 +124,7 @@
                 </div>
                 <div class="collapse" id="postInstallMessage" data-toggle="false">
                     <div class="appstore-install-description">
-                        <div ng-bind-html="appInstall.app.manifest.postInstallMessage | markdown2html"></div>
+                        <div ng-bind-html="appInstall.app.manifest.postInstallMessage | postInstallMessage:appInstall.app | markdown2html"></div>
                     </div>
                 </div>
             </div>