diff --git a/src/views/app.html b/src/views/app.html
index 1bea4162f..4e0edad7f 100644
--- a/src/views/app.html
+++ b/src/views/app.html
@@ -623,12 +623,13 @@
         <div ng-click="setView('display')" ng-class="{ 'active': view === 'display' }">{{ 'app.displayTabTitle' | tr }}</div>
         <div ng-click="setView('location')" ng-class="{ 'active': view === 'location' }" ng-show="app.accessLevel === 'admin'">{{ 'app.locationTabTitle' | tr }}</div>
         <div ng-click="setView('access')" ng-class="{ 'active': view === 'access' }" ng-show="app.accessLevel === 'admin'">{{ 'app.accessControlTabTitle' | tr }}</div>
-        <div ng-click="setView('resources')" ng-class="{ 'active': view === 'resources' }">{{ 'app.resourcesTabTitle' | tr }}</div>
-        <div ng-click="setView('storage')" ng-class="{ 'active': view === 'storage' }" ng-show="app.accessLevel === 'admin'">{{ 'app.storageTabTitle' | tr }}</div>
-        <div ng-click="setView('graphs')" ng-class="{ 'active': view === 'graphs' }">{{ 'app.graphsTabTitle' | tr }}</div>
+        <div ng-click="setView('resources')" ng-class="{ 'active': view === 'resources' }" ng-show="!isProxyApp(app)">{{ 'app.resourcesTabTitle' | tr }}</div>
+        <div ng-click="setView('storage')" ng-class="{ 'active': view === 'storage' }" ng-show="app.accessLevel === 'admin' && !isProxyApp(app)">{{ 'app.storageTabTitle' | tr }}</div>
+        <div ng-click="setView('graphs')" ng-class="{ 'active': view === 'graphs' }" ng-show="!isProxyApp(app)">{{ 'app.graphsTabTitle' | tr }}</div>
+        <div ng-click="setView('proxy')" ng-class="{ 'active': view === 'proxy' }" ng-show="isProxyApp(app)">Proxy</div>
         <div ng-click="setView('security')" ng-class="{ 'active': view === 'security' }">{{ 'app.securityTabTitle' | tr }}</div>
-        <div ng-click="setView('email')" ng-class="{ 'active': view === 'email' }" ng-show="app.accessLevel === 'admin' && (app.manifest.addons.sendmail || app.manifest.addons.recvmail)">{{ 'app.emailTabTitle' | tr }}</div>
-        <div ng-click="setView('cron')" ng-class="{ 'active': view === 'cron' }">{{ 'app.cronTabTitle' | tr }}</div>
+        <div ng-click="setView('email')" ng-class="{ 'active': view === 'email' }" ng-show="app.accessLevel === 'admin' && (app.manifest.addons.sendmail || app.manifest.addons.recvmail) && !isProxyApp(app)">{{ 'app.emailTabTitle' | tr }}</div>
+        <div ng-click="setView('cron')" ng-class="{ 'active': view === 'cron' }" ng-show="!isProxyApp(app)">{{ 'app.cronTabTitle' | tr }}</div>
         <div ng-click="setView('updates')" ng-class="{ 'active': view === 'updates' }">{{ 'app.updatesTabTitle' | tr }}</div>
         <div ng-click="setView('backups')" ng-class="{ 'active': view === 'backups' }">{{ 'app.backupsTabTitle' | tr }}</div>
         <div ng-click="setView('repair')" ng-class="{ 'active': view === 'repair' }">{{ 'app.repairTabTitle' | tr }}</div>
@@ -1222,6 +1223,29 @@
         </div>
       </div>
 
+      <div class="card" ng-show="view === 'proxy'">
+        <div class="row">
+          <div class="col-md-12">
+            <form role="form" name="ProxyForm" ng-submit="proxy.submit()" autocomplete="off">
+              <div class="form-group">
+                <label class="control-label" style="width: 100%">Upstream URI</label>
+                <input type="text" ng-model="proxy.upstreamUri" placeholder="" class="form-control"/>
+              </div>
+
+              <input class="ng-hide" type="submit" ng-disabled="proxyForm.$invalid || proxy.busy"/>
+            </form>
+          </div>
+        </div>
+        <br/>
+        <div class="row">
+          <div class="col-md-12 text-right">
+            <button class="btn btn-outline btn-primary pull-right" ng-click="proxy.submit()" ng-disabled="proxyForm.$invalid || proxy.busy || app.error" tooltip-enable="app.error" uib-tooltip="App is in error state">
+              <i class="fa fa-circle-notch fa-spin" ng-show="proxy.busy"></i> Save
+            </button>
+          </div>
+        </div>
+      </div>
+
       <div class="card" ng-show="view === 'security'">
         <div class="row">
           <div class="col-md-12">
@@ -1244,7 +1268,7 @@
         <br/>
         <div class="row">
           <div class="col-md-12 text-right">
-            <button class="btn btn-outline btn-primary pull-right" ng-click="security.submit()" ng-disabled="security.$invalid || security.busy || app.error" tooltip-enable="app.error" uib-tooltip="App is in error state">
+            <button class="btn btn-outline btn-primary pull-right" ng-click="security.submit()" ng-disabled="securityForm.$invalid || security.busy || app.error" tooltip-enable="app.error" uib-tooltip="App is in error state">
               <i class="fa fa-circle-notch fa-spin" ng-show="security.busy"></i> {{ 'app.security.csp.saveAction' | tr }}
             </button>
           </div>
diff --git a/src/views/app.js b/src/views/app.js
index f693c7de1..889b79731 100644
--- a/src/views/app.js
+++ b/src/views/app.js
@@ -162,6 +162,10 @@ angular.module('Application').controller('AppController', ['$scope', '$location'
         $scope.view = view;
     };
 
+    $scope.isProxyApp = function (app) {
+        return app.manifest.id === 'io.cloudron.builtin.appproxy';
+    };
+
     $scope.stopAppTask = function (taskId) {
         Client.stopTask(taskId, function (error) {
             // we can ignore a call trying to cancel an already done task
@@ -1132,6 +1136,33 @@ angular.module('Application').controller('AppController', ['$scope', '$location'
         }
     };
 
+    $scope.proxy = {
+        busy: false,
+        error: {},
+        success: false,
+
+        upstreamUri: '',
+
+        show: function () {
+            $scope.proxy.error = {};
+            $scope.proxy.upstreamUri = $scope.app.upstreamUri || '';
+        },
+
+        submit: function () {
+            $scope.proxy.busy = true;
+            $scope.proxy.error = {};
+
+            Client.configureApp($scope.app.id, 'upstream_uri', { upstreamUri: $scope.proxy.upstreamUri }, function (error) {
+                if (error) return Client.error(error);
+
+                $timeout(function () {
+                    $scope.proxy.success = true;
+                    $scope.proxy.busy = false;
+                }, 1000);
+            });
+        }
+    };
+
     $scope.updates = {
         busy: false,
         busyCheck: false,