diff --git a/src/views/app.html b/src/views/app.html
index f391ce89c..40cb99635 100644
--- a/src/views/app.html
+++ b/src/views/app.html
@@ -631,7 +631,10 @@
                 <div class="form-group">
                   <div ng-show="access.ssoAuth">
                     <label class="control-label">User management</label>
-                    <p class="text-small" ng-show="access.ftp">This setting also controls SFTP access.</p>
+                    <p>
+                      This app is configured to authenticate with the Cloudron User Directory.
+                      <span class="text-small" ng-show="access.ftp">This setting also controls SFTP access.</span>
+                    </p>
                   </div>
                   <div ng-show="!access.ssoAuth">
                     <label class="control-label">Dashboard visibility</label>
diff --git a/src/views/apps.html b/src/views/apps.html
index 57c1146cc..d8ed4fd52 100644
--- a/src/views/apps.html
+++ b/src/views/apps.html
@@ -45,11 +45,20 @@
         </h5>
       </div>
       <div class="modal-body">
-        <p ng-show="appInfo.app.manifest.documentationUrl">Please see the <a target="_blank" ng-href="{{appInfo.app.manifest.documentationUrl}}">documentation</a> for helpful information and common topics for this app.</p>
-        <p>If you need further help, refer to the <a target="_blank" ng-href="{{ appInfo.app.manifest.forumUrl || 'https://forum.cloudron.io' }}">forum section</a>.</p>
+        <p>Please see the <a target="_blank" ng-href="{{appInfo.app.manifest.documentationUrl}}">{{ appInfo.app.manifest.title }} documentation</a> for helpful information and common topics on this app.
+          If you need further help, refer to Cloudron's <a target="_blank" ng-href="{{ appInfo.app.manifest.forumUrl || 'https://forum.cloudron.io' }}">{{ appInfo.app.manifest.title }} forum section</a>.
+        </p>
+
+        <a ng-show="appInfo.app.manifest.postInstallMessage" href="" data-toggle="collapse" data-parent="#accordion" data-target="#appinfo_postinstall_message">
+          <i class="fa fa-angle-right"></i>
+          First time setup instructions
+        </a>
+
+        <div id="appinfo_postinstall_message" class="panel-collapse collapse">
+          <br/>
+          <div ng-bind-html="appInfo.app.manifest.postInstallMessage | postInstallMessage:appInfo.app | markdown2html"></div>
+        </div>
 
-        <hr ng-show="appInfo.app.manifest.postInstallMessage"/>
-        <div ng-bind-html="appInfo.app.manifest.postInstallMessage | postInstallMessage:appInfo.app | markdown2html"></div>
       </div>
       <div class="modal-footer">
         <button type="button" class="btn btn-primary" data-dismiss="modal">Close</button>
@@ -134,7 +143,7 @@
               <div class="grid-item-actions" ng-show="user.isAtLeastAdmin">
                 <a ng-href="#/app/{{ app.id}}/display" uib-tooltip="Config" tooltip-placement="right" tooltip-class="grid-items-action-tooltip"><i class="fas fa-cogs"></i></a>
                 <a ng-href="{{ '/logs.html?appId=' + app.id }}" target="_blank" uib-tooltip="Logs" tooltip-placement="right" tooltip-class="grid-items-action-tooltip"><i class="fas fa-align-left"></i></a>
-                <a ng-href="" class="hand" ng-click="appInfo.show(app)" uib-tooltip="Info" tooltip-placement="right" tooltip-class="grid-items-action-tooltip"><i class="fas fa-info-circle"></i></a>
+                <a ng-href="" ng-show="app.appStoreId" class="hand" ng-click="appInfo.show(app)" uib-tooltip="Info" tooltip-placement="right" tooltip-class="grid-items-action-tooltip"><i class="fas fa-info-circle"></i></a>
                 <a ng-href="{{ app | applicationLink }}{{ app.manifest.configurePath }}" target="_blank" ng-show="app.manifest.configurePath && (app | applicationLink)" uib-tooltip="Login Page" tooltip-placement="right" tooltip-class="grid-items-action-tooltip"><i class="fas fa-external-link-alt"></i></a>
               </div>
 
diff --git a/src/views/apps.js b/src/views/apps.js
index eea85ec50..0ea4d18d3 100644
--- a/src/views/apps.js
+++ b/src/views/apps.js
@@ -101,5 +101,11 @@ angular.module('Application').controller('AppsController', ['$scope', '$timeout'
         });
     });
 
+    $('.collapse').on('shown.bs.collapse', function(){
+        $(this).parent().find('.fa-angle-right').removeClass('fa-angle-right').addClass('fa-angle-down');
+    }).on('hidden.bs.collapse', function(){
+        $(this).parent().find('.fa-angle-down').removeClass('fa-angle-down').addClass('fa-angle-right');
+    });
+
     $('.modal-backdrop').remove();
 }]);