diff --git a/webadmin/src/views/apps.html b/webadmin/src/views/apps.html
index 36c80a344..2a9df3028 100644
--- a/webadmin/src/views/apps.html
+++ b/webadmin/src/views/apps.html
@@ -208,7 +208,7 @@
     <div class="modal-dialog">
         <div class="modal-content">
             <div class="modal-header">
-                <h4 class="modal-title">{{ Account information for appAccounts.app.fqdn }}</h4>
+                <h4 class="modal-title">Account information for {{ appAccounts.app.fqdn }}</h4>
             </div>
             <div class="modal-body">
                 <div class="appstore-install-description">
@@ -366,11 +366,6 @@
                                         <div class="progress-bar progress-bar-success" role="progressbar" style="width: {{ app.progress }}%"></div>
                                     </div>
                                 </div>
-                                <div>
-                                    <a href="" ng-click="showAccounts(app)" ng-style="{ 'visibility': (app | installationActive) ? 'visible' : 'hidden' }">
-                                        <i class="fa fa-users scale"></i>
-                                    </a>
-                                </div>
                             </div>
                         </div>
                     </div>
@@ -405,6 +400,12 @@
                         <div ng-show="app.installationState === 'installed' || app.installationState === 'pending_configure' || (app | installError)">
                             <a href="" ng-click="showConfigure(app)" title="Configure App"><i class="fa fa-wrench scale"></i></a>
                         </div>
+
+                        <div ng-show="hasAccountInfo(app)">
+                            <a href="" ng-click="showAccounts(app)">
+                                <i class="fa fa-question scale"></i>
+                            </a>
+                        </div>
                     </div>
 
                     <!-- we check the version here because the box updater does not know when an app gets updated -->
diff --git a/webadmin/src/views/apps.js b/webadmin/src/views/apps.js
index 59e16e697..4323146cd 100644
--- a/webadmin/src/views/apps.js
+++ b/webadmin/src/views/apps.js
@@ -284,7 +284,7 @@ angular.module('Application').controller('AppsController', ['$scope', '$location
         $scope.reset();
 
         $scope.appAccounts.app = app;
-        $scope.appAccounts.info = app.manifest.description;
+        $scope.appAccounts.info = app.manifest.description.match(/### Accounts([\s\S]*?)###/m)[1];
 
         $('#appAccountsModal').modal('show');
 
@@ -481,6 +481,10 @@ angular.module('Application').controller('AppsController', ['$scope', '$location
         window.history.back();
     };
 
+    $scope.hasAccountInfo = function (app) {
+        return app.manifest && app.manifest.description.match(/### Accounts/) !== null;
+    };
+
     function fetchUsers() {
         Client.getUsers(function (error, users) {
             if (error) {