diff --git a/src/routes/cloudron.js b/src/routes/cloudron.js
index 730950067..da4ed29cb 100644
--- a/src/routes/cloudron.js
+++ b/src/routes/cloudron.js
@@ -135,7 +135,7 @@ function feedback(req, res, next) {
         req.body.type !== mailer.FEEDBACK_TYPE_TICKET &&
         req.body.type !== mailer.FEEDBACK_TYPE_APP_MISSING &&
         req.body.type !== mailer.FEEDBACK_TYPE_UPGRADE_REQUEST &&
-        req.body.type !== mailer.FEEDBACK_TYPE_APP_ERROR) return next(new HttpError(400, 'type must be either "ticket", "feedback", "app_missing", "app_error" or "upgrade"'));
+        req.body.type !== mailer.FEEDBACK_TYPE_APP_ERROR) return next(new HttpError(400, 'type must be either "ticket", "feedback", "app_missing", "app_error" or "upgrade_request"'));
     if (typeof req.body.subject !== 'string' || !req.body.subject) return next(new HttpError(400, 'subject must be string'));
     if (typeof req.body.description !== 'string' || !req.body.description) return next(new HttpError(400, 'description must be string'));
 
diff --git a/webadmin/src/index.html b/webadmin/src/index.html
index 77da79579..df36c38d9 100644
--- a/webadmin/src/index.html
+++ b/webadmin/src/index.html
@@ -111,6 +111,25 @@
         </div>
     </div>
 
+    <!-- Modal plan upgrade -->
+    <div class="modal fade" id="upgradeModal" tabindex="-1" role="dialog">
+        <div class="modal-dialog">
+            <div class="modal-content">
+                <div class="modal-header">
+                    <button type="button" class="close" data-dismiss="modal">&times;</button>
+                    <h4 class="modal-title">Cloudron Upgrade</h4>
+                </div>
+                <div class="modal-body">
+                    <p>See available plans for upgrade at <a href="{{ config.webServerOrigin + '/pricing.html' }}" target="_blank">cloudron.io</a>.</p>
+                </div>
+                <div class="modal-footer">
+                    <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
+                    <button type="button" class="btn btn-success" ng-click="requestUpgrade()" ng-disabled="upgradeRequest.busy"><i class="fa fa-spinner fa-pulse" ng-show="upgradeRequest.busy"></i> Request Upgrade</button>
+                </div>
+            </div>
+        </div>
+    </div>
+
     <div class="animateMe ng-hide" ng-show="initialized">
 
         <!-- Navigation -->
diff --git a/webadmin/src/js/main.js b/webadmin/src/js/main.js
index 633c7df1a..b38ffcecf 100644
--- a/webadmin/src/js/main.js
+++ b/webadmin/src/js/main.js
@@ -13,6 +13,10 @@ angular.module('Application').controller('MainController', ['$scope', '$route',
         password: ''
     };
 
+    $scope.upgradeRequest = {
+        busy: false
+    };
+
     $scope.isActive = function (url) {
         if (!$route.current) return false;
         return $route.current.$$route.originalPath.indexOf(url) === 0;
@@ -37,6 +41,23 @@ angular.module('Application').controller('MainController', ['$scope', '$route',
         window.location.href = '/error.html';
     };
 
+    $scope.requestUpgrade = function () {
+        $scope.upgradeRequest.busy = true;
+
+        var subject = 'User requested upgrade for ' + $scope.config.fqdn;
+        var description = 'User ' + $scope.user.email + ' requested an upgrade for ' + $scope.config.fqdn + '. Get back to him!!';
+
+        Client.feedback('upgrade_request', subject, description, function (error) {
+            $scope.upgradeRequest.busy = false;
+
+            if (error) return Client.notify('Error', error.message, false, 'error');
+
+            Client.notify('Success', 'We will get back to you as soon as possible for the upgrade.', true, 'success');
+
+            $('#upgradeModal').modal('hide');
+        });
+    };
+
     $scope.showUpdateModal = function (form) {
         $scope.update.error.password = null;
         $scope.update.password = '';
diff --git a/webadmin/src/views/appstore.html b/webadmin/src/views/appstore.html
index 72841ad2e..eb9d93679 100644
--- a/webadmin/src/views/appstore.html
+++ b/webadmin/src/views/appstore.html
@@ -104,11 +104,10 @@
                 <div class="collapse" id="collapseResourceConstraint" data-toggle="false">
                     <h4 class="text-danger">This Cloudron is running low on resources.</h4>
                     <p>Installing this app might decrease the performance of other apps. The Cloudron's resources can be extended with a plan upgrade or available resources may be freed up by uninstalling unused applications.</p>
-                    <p>See available plans for upgrade at <a href="{{ config.webServerOrigin + '/pricing.html' }}" target="_blank">cloudron.io</a>.</p>
                 </div>
             </div>
             <div class="modal-footer">
-                <button type="button" class="btn btn-success pull-left" ng-show="!appInstall.installFormVisible && user.admin && appInstall.resourceConstraintVisible" ng-click="">Upgrade Cloudron</button>
+                <button type="button" class="btn btn-success pull-left" ng-show="!appInstall.installFormVisible && user.admin && appInstall.resourceConstraintVisible" ng-click="showRequestUpgrade()">Upgrade Cloudron</button>
                 <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
                 <button type="button" class="btn btn-danger" ng-show="!appInstall.installFormVisible && user.admin && appInstall.resourceConstraintVisible" ng-click="appInstall.showForm(true)">Install anyway</button>
                 <button type="button" class="btn btn-success" ng-show="!appInstall.installFormVisible && user.admin && !appInstall.resourceConstraintVisible" ng-click="appInstall.showForm()">Install</button>
diff --git a/webadmin/src/views/appstore.js b/webadmin/src/views/appstore.js
index eac26f1f4..4d5d09bd3 100644
--- a/webadmin/src/views/appstore.js
+++ b/webadmin/src/views/appstore.js
@@ -314,6 +314,11 @@ angular.module('Application').controller('AppStoreController', ['$scope', '$loca
         $('#appNotFoundModal').modal('show');
     };
 
+    $scope.showRequestUpgrade = function () {
+        $('#appInstallModal').modal('hide');
+        $('#upgradeModal').modal('show');
+    };
+
     $scope.gotoApp = function (app) {
         $location.path('/appstore/' + app.manifest.id, false).search({ version : app.manifest.version });
     };
diff --git a/webadmin/src/views/settings.html b/webadmin/src/views/settings.html
index 7b15c368f..ba142dc9b 100644
--- a/webadmin/src/views/settings.html
+++ b/webadmin/src/views/settings.html
@@ -107,6 +107,10 @@
                     <td class="text-right" style="vertical-align: top; white-space: nowrap;">{{ config.version }}</td>
                 </tr>
             </table>
+            <br/>
+            <br/>
+            <br/>
+            <button class="btn btn-primary pull-right" data-toggle="modal" data-target="#upgradeModal">Upgrade</button>
         </div>
     </div>
 </div>