diff --git a/src/views/app.html b/src/views/app.html
index 6c894e411..22e6e9ecf 100644
--- a/src/views/app.html
+++ b/src/views/app.html
@@ -1,3 +1,27 @@
+<!-- TODO use this once we enable custom SSL certificate ui again -->
+<!-- <div class="hide">
+  <label class="control-label" for="appConfigureCertificateInput" ng-show="appConfigure.domain.provider !== 'caas'">Certificate (optional)</label>
+  <div class="has-error text-center" ng-show="appConfigure.error.cert && appConfigure.domain.provider !== 'caas'">{{ appConfigure.error.cert }}</div>
+  <div class="form-group" ng-class="{ 'has-error': !appConfigureForm.certificate.$dirty && appConfigure.error.cert }" ng-show="appConfigure.domain.provider !== 'caas'">
+    <div class="input-group">
+      <input type="file" id="appConfigureCertificateFileInput" onchange="readCertificate()" style="display:none"/>
+      <input type="text" class="form-control" placeholder="Certificate" ng-model="appConfigure.certificateFileName" id="appConfigureCertificateInput" name="certificate" onclick="getElementById('appConfigureCertificateFileInput').click();" style="cursor: pointer;" ng-required="appConfigure.keyFileName">
+      <span class="input-group-addon">
+        <i class="fa fa-upload" onclick="getElementById('appConfigureCertificateFileInput').click();"></i>
+      </span>
+    </div>
+  </div>
+  <div class="form-group" ng-class="{ 'has-error': !appConfigureForm.key.$dirty && appConfigure.error.cert }" ng-show="appConfigure.domain.provider !== 'caas'">
+    <div class="input-group">
+      <input type="file" id="appConfigureKeyFileInput" onchange="readKey()" style="display:none"/>
+      <input type="text" class="form-control" placeholder="Key" ng-model="appConfigure.keyFileName" id="appConfigureKeyInput" name="key" onclick="getElementById('appConfigureKeyFileInput').click();" style="cursor: pointer;" ng-required="appConfigure.certificateFileName">
+      <span class="input-group-addon">
+        <i class="fa fa-upload" onclick="getElementById('appConfigureKeyFileInput').click();"></i>
+      </span>
+    </div>
+  </div>
+</div> -->
+
 <script>
     function imageErrorHandler(elem) {
         'use strict';
@@ -58,6 +82,12 @@
 
         <br/>
 
+        <p>
+          <b>{{ app | installationStateLabel:user }}</b>
+        </p>
+
+        <br/>
+
         <p>
           {{ app.manifest.title }}
           <span class="app-info-meta text-small">{{ app.upstreamVersion }} (Package <a ng-href="/#/appstore/{{app.manifest.id}}?version={{app.manifest.version}}">v{{ app.manifest.version }}</a>) </span>
diff --git a/src/views/app.js b/src/views/app.js
index 851b3b7e2..060becdd5 100644
--- a/src/views/app.js
+++ b/src/views/app.js
@@ -4,6 +4,36 @@
 /* global $ */
 /* global asyncSeries */
 
+
+// TODO use this once we enable custom SSL certificate ui again
+// $scope.readCertificate = function (event) {
+//     $scope.$apply(function () {
+//         $scope.appConfigure.certificateFile = null;
+//         $scope.appConfigure.certificateFileName = event.target.files[0].name;
+
+//         var reader = new FileReader();
+//         reader.onload = function (result) {
+//             if (!result.target || !result.target.result) return console.error('Unable to read local file');
+//             $scope.appConfigure.certificateFile = result.target.result;
+//         };
+//         reader.readAsText(event.target.files[0]);
+//     });
+// };
+
+// $scope.readKey = function (event) {
+//     $scope.$apply(function () {
+//         $scope.appConfigure.keyFile = null;
+//         $scope.appConfigure.keyFileName = event.target.files[0].name;
+
+//         var reader = new FileReader();
+//         reader.onload = function (result) {
+//             if (!result.target || !result.target.result) return console.error('Unable to read local file');
+//             $scope.appConfigure.keyFile = result.target.result;
+//         };
+//         reader.readAsText(event.target.files[0]);
+//     });
+// };
+
 angular.module('Application').controller('AppController', ['$scope', '$location', '$timeout', '$interval', 'Client', function ($scope, $location, $timeout, $interval, Client) {
     Client.onReady(function () { if (!Client.getUserInfo().admin) $location.path('/'); });
 
diff --git a/src/views/apps.html b/src/views/apps.html
index d13d3c5c6..c900ac8b4 100644
--- a/src/views/apps.html
+++ b/src/views/apps.html
@@ -1,270 +1,3 @@
-<!-- Modal configure/repair app -->
-<div class="modal fade" id="appConfigureModal" tabindex="-1" role="dialog">
-    <div class="modal-dialog">
-        <div class="modal-content">
-            <div class="modal-header">
-                <h4 class="modal-title" ng-show="(appConfigure.app | installError)">Repair {{ appConfigure.app.fqdn }}</h4>
-                <h4 class="modal-title" ng-hide="(appConfigure.app | installError)">Configure {{ appConfigure.app.fqdn }}</h4>
-            </div>
-            <div class="modal-body" style="padding: 0 15px">
-                <fieldset>
-                    <form role="form" name="appConfigureForm" ng-submit="appConfigure.submit()" autocomplete="off">
-                        <uib-tabset active="appConfigure.action">
-                            <uib-tab index="'location'" heading="Location">
-                                <br/>
-                                <div class="has-error text-center" ng-show="appConfigure.error.other">{{ appConfigure.error.other }}</div>
-                                <div class="form-group" ng-class="{ 'has-error': (appConfigureForm.location.$dirty && appConfigureForm.location.$invalid) || (!appConfigureForm.location.$dirty && appConfigure.error.location)  }">
-                                    <label class="control-label" for="appConfigureLocationInput">Location {{ appConfigure.error.location }} </label>
-                                    <div class="input-group form-inline">
-                                        <input type="text" class="form-control" ng-model="appConfigure.location" id="appConfigureLocationInput" name="location" placeholder="{{ 'Leave empty to use bare domain' }}" autofocus>
-
-                                        <div class="input-group-btn">
-                                            <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
-                                                <span>{{ (!appConfigure.location ? '' : (appConfigure.domain.config.hyphenatedSubdomains ? '-' : '.')) + appConfigure.domain.domain }}</span>
-                                                <span class="caret"></span>
-                                            </button>
-                                            <ul class="dropdown-menu dropdown-menu-right" role="menu">
-                                                <li ng-repeat="domain in domains">
-                                                    <a href="" ng-click="appConfigure.domain = domain">{{ domain.domain }}</a>
-                                                </li>
-                                            </ul>
-                                        </div>
-                                    </div>
-                                </div>
-
-                                <p class="text-center" ng-show="appConfigure.location && appConfigure.domain.provider === 'manual'">
-                                    <b>Add an A record manually for {{ appConfigure.location }} to this Cloudron's public IP</b>
-                                    <br>
-                                </p>
-
-                                <div class="has-error text-center" ng-show="appConfigure.error.port">{{ appConfigure.error.port }}</div>
-                                <div ng-repeat="(env, info) in appConfigure.portBindingsInfo">
-                                    <ng-form name="portInfo_form">
-                                        <div class="form-group" ng-class="{ 'has-error': (!appConfigureForm.itemName{{$index}}.$dirty && appConfigure.error.port) || (portInfo_form.itemName{{$index}}.$dirty && portInfo_form.itemName{{$index}}.$invalid) }">
-                                            <label class="control-label" for="appConfigurePortInput{{env}}"><input type="checkbox" ng-model="appConfigure.portBindingsEnabled[env]">
-                                                {{ info.title }}
-                                                <sup>
-                                                  <a popover-placement="top-right" popover-trigger="outsideClick" uib-popover="{{info.description}} ({{ HOST_PORT_MIN }} - {{ HOST_PORT_MAX }})"><i class="fa fa-question-circle"></i></a>
-                                                </sup>
-                                            </label>
-                                            <input type="number" class="form-control" ng-model="appConfigure.portBindings[env]" ng-disabled="!appConfigure.portBindingsEnabled[env]" id="appConfigurePortInput{{env}}" later-name="itemName{{$index}}" min="{{HOST_PORT_MIN}}" max="{{HOST_PORT_MAX}}" required>
-                                        </div>
-                                    </ng-form>
-                                </div>
-
-                                <div class="form-group alternate-domains">
-                                  <label class="control-label">Redirections  <sup><a ng-href="{{ config.webServerOrigin }}/documentation/apps/#redirections" class="help" target="_blank"><i class="fa fa-question-circle"></i></a></sup></label>
-                                  <div class="has-error" ng-show="appConfigure.error.alternateDomains">{{ appConfigure.error.alternateDomains }}</div>
-
-                                  <div class="row" ng-repeat="alternateDomain in appConfigure.alternateDomains">
-                                    <div class="col col-lg-11">
-                                      <div class="input-group">
-                                        <input type="text" class="form-control" ng-model="alternateDomain.subdomain" placeholder="Leave empty to use bare domain">
-
-                                        <div class="input-group-btn">
-                                          <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
-                                            <span>{{ (!alternateDomain.subdomain ? '' : (alternateDomain.domain.config.hyphenatedSubdomains ? '-' : '.')) + alternateDomain.domain.domain }}</span>
-                                            <span class="caret"></span>
-                                          </button>
-                                          <ul class="dropdown-menu dropdown-menu-right" role="menu">
-                                            <li ng-repeat="domain in domains">
-                                              <a href="" ng-click="alternateDomain.domain = domain">{{ domain.domain }}</a>
-                                            </li>
-                                          </ul>
-                                        </div>
-                                      </div>
-                                    </div>
-                                    <div class="col col-lg-1">
-                                      <button class="btn btn-danger btn-sm" ng-click="appConfigure.delAlternateDomain($event, $index)"><i class="far fa-trash-alt"></i></button>
-                                    </div>
-                                  </div>
-                                  <div ng-show="appConfigure.alternateDomains.length === 0">
-                                      No alternate domains are configured. <a href="" ng-click="appConfigure.addAlternateDomain($event)">Add a domain</a>
-                                  </div>
-                                  <div ng-show="appConfigure.alternateDomains.length > 0" style="margin-top: 5px;">
-                                    <a href="" ng-click="appConfigure.addAlternateDomain($event)">Add another domain</a>
-                                  </div>
-                                </div>
-                            </uib-tab>
-
-                            <uib-tab index="'access'" heading="Access">
-                                <br/>
-                                <div class="form-group">
-                                    <div ng-show="appConfigure.ssoAuth">
-                                        <label class="control-label">User management</label>
-                                        <p class="text-small" ng-show="appConfigure.ftp">This setting also controls SFTP access.</p>
-                                    </div>
-                                    <div ng-show="!appConfigure.ssoAuth">
-                                      <label class="control-label">Dashboard visibility</label>
-                                      <p ng-show="!appConfigure.app.manifest.addons.email" class="text-small">
-                                          This app has it's own user management.
-                                          <span ng-show="appConfigure.ftp">This setting also controls SFTP access.</span>
-                                      </p>
-                                      <p ng-show="appConfigure.app.manifest.addons.email" class="text-small">
-                                          This app is pre-configured for use with <a href="https://cloudron.io/documentation/email/" target="_blank">Cloudron Email</a>.
-                                      </p>
-                                    </div>
-
-                                    <div class="radio">
-                                        <label>
-                                            <input type="radio" ng-model="appConfigure.accessRestrictionOption" value="any">
-                                            <span ng-show="appConfigure.ssoAuth">Allow all users on this Cloudron</span>
-                                            <span ng-show="!appConfigure.ssoAuth">Visible to all users on this Cloudron</span>
-                                        </label>
-                                    </div>
-                                    <div class="radio">
-                                        <label>
-                                            <input type="radio" ng-model="appConfigure.accessRestrictionOption" value="groups">
-
-                                            <span ng-show="appConfigure.ssoAuth">Only allow the following users and groups</span>
-                                            <span ng-show="!appConfigure.ssoAuth">Only visible to the following users and groups</span>
-
-                                            <span class="label label-danger" ng-show="appConfigure.accessRestrictionOption === 'groups' && !appConfigure.isAccessRestrictionValid()">Select at least one user or group</span>
-                                        </label>
-                                    </div>
-                                    <div>
-                                        <div style="margin-left: 20px;">
-                                            <div class="col-md-5">
-                                                Users:
-                                                <multiselect class="input-sm stretch" ng-model="appConfigure.accessRestriction.users" ng-disabled="appConfigure.accessRestrictionOption !== 'groups'" options="user.display for user in users" data-multiple="true"></multiselect>
-                                            </div>
-
-                                            <div class="col-md-5">
-                                                Groups:
-                                                <multiselect class="input-sm stretch" ng-model="appConfigure.accessRestriction.groups" ng-disabled="appConfigure.accessRestrictionOption !== 'groups'" options="group.name for group in groups" data-multiple="true"></multiselect>
-                                            </div>
-                                        </div>
-                                    </div>
-
-                                    <br/>
-                                    <br/>
-                                </div>
-                            </uib-tab>
-
-                            <uib-tab index="'display'" heading="Display">
-                              <br/>
-                              <div class="form-group" ng-class="{ 'has-error': !appConfigureForm.label.$dirty && appConfigure.error.label }">
-                                <label class="control-label">Label</label>
-                                <div class="control-label" ng-show="appConfigure.error.label">{{appConfigure.error.label}}</div>
-                                <input type="text" class="form-control" id="appConfigureLabelInput" name="label" ng-model="appConfigure.label">
-                              </div>
-                              <div class="form-group">
-                                <label class="control-label">Tags</label>
-                                <tag-input class="form-control" placeholder="Use comma to separate tags" taglist="appConfigure.tags" name="tags" uib-tooltip="For grouping in the dashboard"></tag-input>
-                              </div>
-                              <div class="form-group">
-                                <div>
-                                  <label class="control-label">Icon</label>
-                                  <a href="" class="pull-right" style="font-weight: normal;" ng-click="appConfigure.resetCustomIcon()">Reset Icon</a>
-                                </div>
-                                <div id="previewIcon" class="app-custom-icon" ng-click="appConfigure.showCustomIconSelector()" style="background-image: url('{{appConfigure.iconUrl()}}');">
-                                  <div class="overlay"></div>
-                                </div>
-                                <input type="file" id="iconFileInput" style="display: none" accept="image/png"/>
-                              </div>
-                              <br/>
-                            </uib-tab>
-
-                            <uib-tab index="'resources'" heading="Resources">
-                              <br/>
-                              <div class="form-group">
-                                  <label class="control-label" for="memoryLimit">Memory Limit <sup><a ng-href="{{ config.webServerOrigin }}/documentation/apps/#increasing-the-memory-limit-of-an-app" class="help" target="_blank"><i class="fa fa-question-circle"></i></a></sup> : <b>{{ appConfigure.memoryLimit ? appConfigure.memoryLimit / 1024 / 1024 + 'MB' : 'Default (256 MB)' }}</b></label>
-                                  <br/>
-                                  <div style="padding: 0 10px;">
-                                      <slider id="memoryLimit" ng-model="appConfigure.memoryLimit" step="134217728" tooltip="hide" ticks="appConfigure.memoryTicks" ticks-snap-bounds="67108864"></slider>
-                                  </div>
-                              </div>
-
-                              <div ng-hide="true" class="form-group" ng-class="{ 'has-error': !appConfigureForm.dataDir.$dirty && appConfigure.error.dataDir }">
-                                  <input type="checkbox" id="appConfigureEnableDataDir" ng-model="appConfigure.dataDirEnabled">
-                                  <label class="control-label" for="appConfigureEnableDataDir">Custom Data Directory</label>
-                                  <div class="control-label" ng-show="appConfigure.error.dataDir">{{appConfigure.error.dataDir}}</div>
-                                  <input type="text" class="form-control" id="appConfigureDataDirInput" name="dataDir" ng-disabled="!appConfigure.dataDirEnabled" placeholder="/mnt/appdata" ng-model="appConfigure.dataDir">
-                              </div>
-                            </uib-tab>
-
-                            <uib-tab index="'email'" heading="Email" ng-if="appConfigure.app.manifest.addons.sendmail || appConfigure.app.manifest.addons.recvmail">
-                              <br/>
-                              <!-- recvmail currently only works with cloudron email -->
-                              <div class="form-group" ng-class="{ 'has-error': !appConfigureForm.mailboxName.$dirty && appConfigure.error.mailboxName }">
-                                <input type="checkbox" id="appConfigureMailboxNameEnabled" ng-model="appConfigure.mailboxNameEnabled">
-                                <label class="control-label" for="appConfigureMailboxNameEnabled">Custom Mail FROM</label>
-                                <div class="has-error" ng-show="appConfigure.error.mailboxName">{{ appConfigure.error.mailboxName }}</div>
-
-                                <div class="input-group form-inline">
-                                    <input type="text" class="form-control" id="appConfigureMailboxNameInput" ng-required="appConfigure.mailboxNameEnabled" name="mailboxName" ng-model="appConfigure.mailboxName" uib-tooltip="App FROM email address. Addresses ending with '.app' are reserved." tooltip-class="long" ng-disabled="!appConfigure.mailboxNameEnabled">
-
-                                    <div class="input-group-btn">
-                                        <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" ng-disabled="!appConfigure.mailboxNameEnabled">
-                                            @{{ appConfigure.domain.domain }}
-                                        </button>
-                                    </div>
-                                </div>
-
-                                <p class="text-small">
-                                  <br/>
-                                  This app is configured to send mail using <a ng-href="/#/email/{{ appConfigure.app.domain }}">{{appConfigure.app.domain}}'s Outbound Email</a> settings.
-                                </p>
-                              </div>
-
-                            </uib-tab>
-
-                            <uib-tab index="'advanced'" heading="Advanced">
-                                <br/>
-
-                                <div class="form-group">
-                                  <label class="control-label" style="width: 100%">Specify robots.txt file content  <sup><a ng-href="{{ config.webServerOrigin }}/documentation/apps/#indexing-by-search-engines-robotstxt" class="help" target="_blank"><i class="fa fa-question-circle"></i></a></sup> <a href="" class="pull-right" style="font-weight: normal;" ng-click="appConfigure.robotsTxt = disableIndexingTemplate">Disable indexing</a></label>
-                                  <textarea ng-model="appConfigure.robotsTxt" placeholder="Leave empty to allow all bots to index this app." class="form-control" rows="4"></textarea>
-                                </div>
-
-                                <div class="form-group">
-                                    <input type="checkbox" id="appConfigureEnableBackup" ng-model="appConfigure.enableBackup">
-                                    <label class="control-label" for="appConfigureEnableBackup">Enable automatic daily backups</label>
-                                </div>
-
-                                <div class="form-group">
-                                    <input type="checkbox" id="appConfigureEnableAutomaticUpdate" ng-model="appConfigure.enableAutomaticUpdate">
-                                    <label class="control-label" for="appConfigureEnableAutomaticUpdate">Enable automatic updates</label>
-                                </div>
-
-                                <div class="hide">
-                                    <label class="control-label" for="appConfigureCertificateInput" ng-show="appConfigure.domain.provider !== 'caas'">Certificate (optional)</label>
-                                    <div class="has-error text-center" ng-show="appConfigure.error.cert && appConfigure.domain.provider !== 'caas'">{{ appConfigure.error.cert }}</div>
-                                    <div class="form-group" ng-class="{ 'has-error': !appConfigureForm.certificate.$dirty && appConfigure.error.cert }" ng-show="appConfigure.domain.provider !== 'caas'">
-                                        <div class="input-group">
-                                            <input type="file" id="appConfigureCertificateFileInput" onchange="readCertificate()" style="display:none"/>
-                                            <input type="text" class="form-control" placeholder="Certificate" ng-model="appConfigure.certificateFileName" id="appConfigureCertificateInput" name="certificate" onclick="getElementById('appConfigureCertificateFileInput').click();" style="cursor: pointer;" ng-required="appConfigure.keyFileName">
-                                            <span class="input-group-addon">
-                                                <i class="fa fa-upload" onclick="getElementById('appConfigureCertificateFileInput').click();"></i>
-                                            </span>
-                                        </div>
-                                    </div>
-                                    <div class="form-group" ng-class="{ 'has-error': !appConfigureForm.key.$dirty && appConfigure.error.cert }" ng-show="appConfigure.domain.provider !== 'caas'">
-                                        <div class="input-group">
-                                            <input type="file" id="appConfigureKeyFileInput" onchange="readKey()" style="display:none"/>
-                                            <input type="text" class="form-control" placeholder="Key" ng-model="appConfigure.keyFileName" id="appConfigureKeyInput" name="key" onclick="getElementById('appConfigureKeyFileInput').click();" style="cursor: pointer;" ng-required="appConfigure.certificateFileName">
-                                            <span class="input-group-addon">
-                                                <i class="fa fa-upload" onclick="getElementById('appConfigureKeyFileInput').click();"></i>
-                                            </span>
-                                        </div>
-                                    </div>
-                                </div>
-                            </uib-tab>
-                        </uib-tabset>
-
-                        <input class="ng-hide" type="submit" ng-disabled="appConfigureForm.$invalid || appConfigure.busy || (appConfigure.accessRestrictionOption === 'groups' && !appConfigure.isAccessRestrictionValid())"/>
-                    </form>
-                </fieldset>
-            </div>
-            <div class="modal-footer ">
-                <button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
-                <button type="button" class="btn btn-success" ng-click="appConfigure.submit()" ng-disabled="appConfigureForm.$invalid || appConfigure.busy || (appConfigure.accessRestrictionOption === 'groups' && !appConfigure.isAccessRestrictionValid())"><i class="fa fa-circle-notch fa-spin" ng-show="appConfigure.busy"></i>
-                  {{ (appConfigure.app | installError) ? 'Repair' : 'Configure' }}
-                </button>
-            </div>
-        </div>
-    </div>
-</div>
 
 <!-- Modal restore app -->
 <div class="modal fade" id="appRestoreModal" tabindex="-1" role="dialog">
@@ -468,7 +201,7 @@
                 <p>{{ appError.app | prettyAppErrorMessage }}</p>
             </div>
             <div class="modal-footer">
-                <button type="button" class="btn btn-primary pull-left" ng-click="appConfigure.show(appError.app)" autofocus>Repair</button>
+                <a type="button" class="btn btn-primary pull-left" ng-href="{{ '/#/app/' + appError.app.id }}" autofocus>Repair</a>
                 <a type="button" class="btn btn-default pull-left" ng-href="{{ '/logs.html?appId=' + appError.app.id }}" target="_blank">Logs</a>
                 <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
             </div>
diff --git a/src/views/apps.js b/src/views/apps.js
index 82f656ecb..7eb829c64 100644
--- a/src/views/apps.js
+++ b/src/views/apps.js
@@ -21,271 +21,6 @@ angular.module('Application').controller('AppsController', ['$scope', '$location
     $scope.backupsEnabled = true;
     $scope.disableIndexingTemplate = '# Disable search engine indexing\n\nUser-agent: *\nDisallow: /';
 
-    $scope.appConfigure = {
-        busy: false,
-        error: {},
-        app: {},
-        domain: null,
-        location: '',
-        advancedVisible: false,
-        portBindings: {},
-        portBindingsEnabled: {},
-        portBindingsInfo: {},
-        robotsTxt: '',
-        certificateFile: null,
-        certificateFileName: '',
-        keyFile: null,
-        keyFileName: '',
-        mailboxName: '',
-        accessRestrictionOption: 'any',
-        accessRestriction: { users: [], groups: [] },
-        alternateDomains: [],
-        mailboxNameEnabled: false,
-        memoryLimit: 0,
-        memoryTicks: [],
-        dataDir: null,
-        dataDirEnabled: false,
-        ssoAuth: false,
-        ftp: false,
-        tags: '',
-        label: '',
-        icon: { data: null },
-
-        action: 'location',
-
-        iconUrl: function () {
-            if ($scope.appConfigure.icon.data === '__original__') { // user clicked reset
-                return $scope.appConfigure.app.iconUrl + '&original=true';
-            } else if ($scope.appConfigure.icon.data) { // user uploaded icon
-                return $scope.appConfigure.icon.data;
-            } else { // current icon
-                return $scope.appConfigure.app.iconUrl;
-            }
-        },
-
-        isAccessRestrictionValid: function () {
-            var tmp = $scope.appConfigure.accessRestriction;
-            return !!(tmp.users.length || tmp.groups.length);
-        },
-
-        addAlternateDomain: function (event) {
-            event.preventDefault();
-            $scope.appConfigure.alternateDomains.push({
-                domain: $scope.domains[0],
-                subdomain: ''
-            });
-        },
-
-        delAlternateDomain: function (event, index) {
-            event.preventDefault();
-            $scope.appConfigure.alternateDomains.splice(index, 1);
-        },
-
-        show: function (app) {
-            $scope.reset();
-
-            // fill relevant info from the app
-            $scope.appConfigure.app = app;
-            $scope.appConfigure.location = app.location;
-            $scope.appConfigure.domain = $scope.domains.filter(function (d) { return d.domain === app.domain; })[0];
-            $scope.appConfigure.portBindingsInfo = angular.extend({}, app.manifest.tcpPorts, app.manifest.udpPorts); // Portbinding map only for information
-            $scope.appConfigure.memoryLimit = app.memoryLimit || app.manifest.memoryLimit || (256 * 1024 * 1024);
-            $scope.appConfigure.dataDirEnabled = !!app.dataDir;
-            $scope.appConfigure.dataDir = app.dataDir;
-            $scope.appConfigure.alternateDomains = app.alternateDomains.map(function (a) { return { subdomain: a.subdomain, domain: $scope.domains.filter(function (d) { return d.domain === a.domain; })[0] };});
-            $scope.appConfigure.robotsTxt = app.robotsTxt;
-            $scope.appConfigure.enableBackup = app.enableBackup;
-            $scope.appConfigure.enableAutomaticUpdate = app.enableAutomaticUpdate;
-            $scope.appConfigure.mailboxNameEnabled = app.mailboxName && (app.mailboxName.match(/\.app$/) === null);
-            $scope.appConfigure.mailboxName = app.mailboxName || '';
-            $scope.appConfigure.label = app.label || '';
-
-            $scope.appConfigure.ftp = app.manifest.addons.localstorage && app.manifest.addons.localstorage.ftp;
-
-            // create ticks starting from manifest memory limit. the memory limit here is currently split into ram+swap (and thus *2 below)
-            // TODO: the *2 will overallocate since 4GB is max swap that cloudron itself allocates
-            $scope.appConfigure.memoryTicks = [ ];
-            var npow2 = Math.pow(2, Math.ceil(Math.log($scope.config.memory)/Math.log(2)));
-            for (var i = 256; i <= (npow2*2/1024/1024); i *= 2) {
-                if (i >= (app.manifest.memoryLimit/1024/1024 || 0)) $scope.appConfigure.memoryTicks.push(i * 1024 * 1024);
-            }
-            if (app.manifest.memoryLimit && $scope.appConfigure.memoryTicks[0] !== app.manifest.memoryLimit) {
-                $scope.appConfigure.memoryTicks.unshift(app.manifest.memoryLimit);
-            }
-
-            $scope.appConfigure.ssoAuth = (app.manifest.addons['ldap'] || app.manifest.addons['oauth']) && app.sso;
-            $scope.appConfigure.accessRestrictionOption = app.accessRestriction ? 'groups' : 'any';
-            $scope.appConfigure.accessRestriction = { users: [], groups: [] };
-
-            if (app.accessRestriction) {
-                var userSet = { };
-                app.accessRestriction.users.forEach(function (uid) { userSet[uid] = true; });
-                $scope.users.forEach(function (u) { if (userSet[u.id] === true) $scope.appConfigure.accessRestriction.users.push(u); });
-
-                var groupSet = { };
-                app.accessRestriction.groups.forEach(function (gid) { groupSet[gid] = true; });
-                $scope.groups.forEach(function (g) { if (groupSet[g.id] === true) $scope.appConfigure.accessRestriction.groups.push(g); });
-            }
-
-            // fill the portBinding structures. There might be holes in the app.portBindings, which signalizes a disabled port
-            for (var env in $scope.appConfigure.portBindingsInfo) {
-                if (app.portBindings && app.portBindings[env]) {
-                    $scope.appConfigure.portBindings[env] = app.portBindings[env];
-                    $scope.appConfigure.portBindingsEnabled[env] = true;
-                } else {
-                    $scope.appConfigure.portBindings[env] = $scope.appConfigure.portBindingsInfo[env].defaultValue || 0;
-                    $scope.appConfigure.portBindingsEnabled[env] = false;
-                }
-            }
-
-            // translate for tag-input
-            $scope.appConfigure.tags = app.tags ? app.tags.join(',') : '';
-
-            $scope.appConfigure.icon = { data: null };
-
-            $('#iconFileInput').get(0).onchange = function (event) {
-                var fr = new FileReader();
-                fr.onload = function () {
-                    $scope.$apply(function () {
-                        // var file = event.target.files[0];
-                        $scope.appConfigure.icon.data = fr.result;
-                    });
-                };
-                fr.readAsDataURL(event.target.files[0]);
-            };
-
-            $('#appConfigureModal').modal('show');
-        },
-
-        submit: function () {
-            $scope.appConfigure.busy = true;
-            $scope.appConfigure.error.other = null;
-            $scope.appConfigure.error.location = null;
-            $scope.appConfigure.error.label = null;
-            $scope.appConfigure.error.dataDir = null;
-            $scope.appConfigure.error.alternateDomains = null;
-            $scope.appConfigure.error.mailboxName = null;
-
-            // only use enabled ports from portBindings
-            var finalPortBindings = {};
-            for (var env in $scope.appConfigure.portBindings) {
-                if ($scope.appConfigure.portBindingsEnabled[env]) {
-                    finalPortBindings[env] = $scope.appConfigure.portBindings[env];
-                }
-            }
-
-            var finalAccessRestriction = null;
-            if ($scope.appConfigure.accessRestrictionOption === 'groups') {
-                finalAccessRestriction = { users: [], groups: [] };
-                finalAccessRestriction.users = $scope.appConfigure.accessRestriction.users.map(function (u) { return u.id; });
-                finalAccessRestriction.groups = $scope.appConfigure.accessRestriction.groups.map(function (g) { return g.id; });
-            }
-
-            var data = {
-                location:  $scope.appConfigure.location,
-                domain: $scope.appConfigure.domain.domain,
-                portBindings: finalPortBindings,
-                accessRestriction: finalAccessRestriction,
-                cert: $scope.appConfigure.certificateFile,
-                key: $scope.appConfigure.keyFile,
-                memoryLimit: $scope.appConfigure.memoryLimit === $scope.appConfigure.memoryTicks[0] ? 0 : $scope.appConfigure.memoryLimit,
-                robotsTxt: $scope.appConfigure.robotsTxt,
-                enableBackup: $scope.appConfigure.enableBackup,
-                enableAutomaticUpdate: $scope.appConfigure.enableAutomaticUpdate,
-                alternateDomains: $scope.appConfigure.alternateDomains.map(function (a) { return { subdomain: a.subdomain, domain: a.domain.domain };}),
-                label: $scope.appConfigure.label,
-                tags: $scope.appConfigure.tags.split(',').map(function (t) { return t.trim(); }).filter(function (t) { return !!t; }),
-                dataDir: $scope.appConfigure.dataDirEnabled ? $scope.appConfigure.dataDir : ''
-            };
-
-            if ($scope.appConfigure.mailboxNameEnabled) {
-                data.mailboxName = $scope.appConfigure.mailboxName;
-
-                // add mailbox automatically for convenience
-                if ($scope.appConfigure.app.manifest.addons.recvmail) {
-                    Client.addMailbox(data.domain, data.mailboxName, $scope.user.id, function (error) {
-                        if (error && error.statusCode !== 409) console.error(error); // it's fine if it already exists
-                    });
-                }
-            } else { // setting to empty will reset to .app name
-                data.mailboxName = '';
-            }
-
-            if ($scope.appConfigure.icon.data === '__original__') { // user reset the icon
-                data.icon = '';
-            } else if ($scope.appConfigure.icon.data) { // user loaded custom icon
-                data.icon = $scope.appConfigure.icon.data.replace(/^data:image\/[a-z]+;base64,/, '');
-            }
-
-            Client.configureApp($scope.appConfigure.app.id, data, function (error) {
-                let tab = 'advanced'; // the tab to switch to
-
-                if (error) {
-                    if (error.statusCode === 409) {
-                        if (error.portName) {
-                            $scope.appConfigure.error.port = error.message;
-                            tab = 'location';
-                        } else if (error.domain && error.domain === $scope.config.adminDomin) {
-                            $scope.appConfigure.error.location = error.message;
-                            $scope.appConfigureForm.location.$setPristine();
-                            tab = 'location';
-                            $('#appConfigureLocationInput').focus();
-                        } else if (error.domain && error.domain !== $scope.config.adminDomin) {
-                            $scope.appConfigure.error.alternateDomains = error.message;
-                            tab = 'location';
-                        } else {
-                            $scope.appConfigure.error.other = error.message;
-                            tab = 'location';
-                        }
-                    } else if (error.statusCode === 400) {
-                        if (error.field === 'mailboxName') {
-                            $scope.appConfigure.error.mailboxName = error.message;
-                            $scope.appConfigureForm.mailboxName.$setPristine();
-                            tab = 'email';
-                            $('#appConfigureMailboxNameInput').focus();
-                        } else if (error.field === 'cert') {
-                            $scope.appConfigure.error.cert = error.message;
-                            $scope.appConfigure.certificateFileName = '';
-                            $scope.appConfigure.certificateFile = null;
-                            $scope.appConfigure.keyFileName = '';
-                            $scope.appConfigure.keyFile = null;
-                        } else if (error.field === 'dataDir') {
-                            $scope.appConfigure.error.dataDir = error.message;
-                            $scope.appConfigureForm.dataDir.$setPristine();
-                            $('#appConfigureDataDirInput').focus();
-                        } else {
-                            $scope.appConfigure.error.other = error.message;
-                            tab = 'location';
-                        }
-                    } else {
-                        $scope.appConfigure.error.other = error.message;
-                        tab = 'location';
-                    }
-
-                    $scope.appConfigure.action = tab;
-                    $scope.appConfigure.busy = false;
-                    return;
-                }
-
-                $scope.appConfigure.busy = false;
-
-                Client.refreshAppCache($scope.appConfigure.app.id); // reflect the new app state immediately
-
-                $('#appConfigureModal').modal('hide');
-
-                $scope.reset();
-            });
-        },
-
-        resetCustomIcon: function () {
-            $scope.appConfigure.icon.data = '__original__';
-        },
-
-        showCustomIconSelector: function () {
-            $('#iconFileInput').click();
-        }
-    };
-
     $scope.appClone = {
         busy: false,
         error: {},
@@ -556,37 +291,11 @@ angular.module('Application').controller('AppsController', ['$scope', '$location
     $scope.reset = function () {
         // close all dialogs
         $('#appErrorModal').modal('hide');
-        $('#appConfigureModal').modal('hide');
         $('#appRestoreModal').modal('hide');
         $('#appUpdateModal').modal('hide');
         $('#appInfoModal').modal('hide');
         $('#appPostInstallConfirmModal').modal('hide');
 
-        // reset configure dialog
-        $scope.appConfigure.error = {};
-        $scope.appConfigure.app = {};
-        $scope.appConfigure.domain = null;
-        $scope.appConfigure.location = '';
-        $scope.appConfigure.advancedVisible = false;
-        $scope.appConfigure.portBindings = {};          // This is the actual model holding the env:port pair
-        $scope.appConfigure.portBindingsEnabled = {};   // This is the actual model holding the enabled/disabled flag
-        $scope.appConfigure.certificateFile = null;
-        $scope.appConfigure.certificateFileName = '';
-        $scope.appConfigure.keyFile = null;
-        $scope.appConfigure.keyFileName = '';
-        $scope.appConfigure.memoryLimit = 0;
-        $scope.appConfigure.memoryTicks = [];
-        $scope.appConfigure.accessRestrictionOption = 'any';
-        $scope.appConfigure.accessRestriction = { users: [], groups: [] };
-        $scope.appConfigure.ssoAuth = false;
-        $scope.appConfigure.ftp = false;
-        $scope.appConfigure.robotsTxt = '';
-        $scope.appConfigure.enableBackup = true;
-        $scope.appConfigure.enableAutomaticUpdate = true;
-
-        $scope.appConfigureForm.$setPristine();
-        $scope.appConfigureForm.$setUntouched();
-
         // reset update dialog
         $scope.appUpdate.error = {};
         $scope.appUpdate.app = {};
@@ -609,33 +318,6 @@ angular.module('Application').controller('AppsController', ['$scope', '$location
         $scope.appPostInstallConfirm.confirmed = false;
     };
 
-    $scope.readCertificate = function (event) {
-        $scope.$apply(function () {
-            $scope.appConfigure.certificateFile = null;
-            $scope.appConfigure.certificateFileName = event.target.files[0].name;
-
-            var reader = new FileReader();
-            reader.onload = function (result) {
-                if (!result.target || !result.target.result) return console.error('Unable to read local file');
-                $scope.appConfigure.certificateFile = result.target.result;
-            };
-            reader.readAsText(event.target.files[0]);
-        });
-    };
-
-    $scope.readKey = function (event) {
-        $scope.$apply(function () {
-            $scope.appConfigure.keyFile = null;
-            $scope.appConfigure.keyFileName = event.target.files[0].name;
-
-            var reader = new FileReader();
-            reader.onload = function (result) {
-                if (!result.target || !result.target.result) return console.error('Unable to read local file');
-                $scope.appConfigure.keyFile = result.target.result;
-            };
-            reader.readAsText(event.target.files[0]);
-        });
-    };
 
     $scope.showInformation = function (app) {
         $scope.reset();
@@ -728,7 +410,7 @@ angular.module('Application').controller('AppsController', ['$scope', '$location
     });
 
     // setup all the dialog focus handling
-    ['appConfigureModal', 'appUpdateModal', 'appRestoreModal', 'appInfoModal', 'appErrorModal'].forEach(function (id) {
+    ['appUpdateModal', 'appRestoreModal', 'appInfoModal', 'appErrorModal'].forEach(function (id) {
         $('#' + id).on('shown.bs.modal', function () {
             $(this).find("[autofocus]:first").focus();
         });