diff --git a/webadmin/src/views/apps.html b/webadmin/src/views/apps.html
index 05ad3458e..200b5687a 100644
--- a/webadmin/src/views/apps.html
+++ b/webadmin/src/views/apps.html
@@ -127,7 +127,7 @@
                                 <label class="control-label" for="memoryLimit">Maximum Memory Usage: <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="memoryTicks" ticks-snap-bounds="67108864"></slider>
+                                    <slider id="memoryLimit" ng-model="appConfigure.memoryLimit" step="134217728" tooltip="hide" ticks="appConfigure.memoryTicks" ticks-snap-bounds="67108864"></slider>
                                 </div>
                             </div>
 
diff --git a/webadmin/src/views/apps.js b/webadmin/src/views/apps.js
index 6eb5d7f1c..14972fb50 100644
--- a/webadmin/src/views/apps.js
+++ b/webadmin/src/views/apps.js
@@ -10,15 +10,6 @@ angular.module('Application').controller('AppsController', ['$scope', '$location
     $scope.groups = [];
     $scope.users = [];
 
-    $scope.memoryTicks = [
-        0, // result to default memory limit
-        256 * 1024 * 1024,
-        512 * 1024 * 1024,
-        1024 * 1024 * 1024,
-        2048 * 1024 * 1024,
-        4096 * 1024 * 1024
-    ];
-
     $scope.appConfigure = {
         busy: false,
         error: {},
@@ -34,7 +25,9 @@ angular.module('Application').controller('AppsController', ['$scope', '$location
         certificateFileName: '',
         keyFile: null,
         keyFileName: '',
-        memoryLimit: $scope.memoryTicks[0],
+        memoryLimit: 0,
+        memoryTicks: [],
+
         accessRestrictionOption: 'any',
         accessRestriction: { users: [], groups: [] },
         xFrameOptions: '',
@@ -97,7 +90,8 @@ angular.module('Application').controller('AppsController', ['$scope', '$location
         $scope.appConfigure.certificateFileName = '';
         $scope.appConfigure.keyFile = null;
         $scope.appConfigure.keyFileName = '';
-        $scope.appConfigure.memoryLimit = $scope.memoryTicks[0];
+        $scope.appConfigure.memoryLimit = 0;
+        $scope.appConfigure.memoryTicks = [];
         $scope.appConfigure.accessRestrictionOption = 'any';
         $scope.appConfigure.accessRestriction = { users: [], groups: [] };
         $scope.appConfigure.xFrameOptions = '';
@@ -192,6 +186,18 @@ angular.module('Application').controller('AppsController', ['$scope', '$location
         $scope.appConfigure.memoryLimit = app.memoryLimit;
         $scope.appConfigure.xFrameOptions = app.xFrameOptions.indexOf('ALLOW-FROM') === 0 ? app.xFrameOptions.split(' ')[1] : '';
 
+        // create ticks starting from manifest memory limit
+        $scope.appConfigure.memoryTicks = [
+             256 * 1024 * 1024,
+             512 * 1024 * 1024,
+             1024 * 1024 * 1024,
+             2048 * 1024 * 1024,
+             4096 * 1024 * 1024
+        ].filter(function (t) { return t >= (app.manifest.memoryLimit || 0); });
+        if (app.manifest.memoryLimit && $scope.appConfigure.memoryTicks[0] !== app.manifest.memoryLimit) {
+            $scope.appConfigure.memoryTicks.unshift(app.manifest.memoryLimit);
+        }
+
         var manifest = app.manifest;
         $scope.appConfigure.needsOAuthProxy = !(manifest.addons['ldap'] || manifest.addons['oauth'] || manifest.addons['simpleauth'] || manifest.addons['email'] || manifest.customAuth);
         if ($scope.appConfigure.needsOAuthProxy && !app.oauthProxy) {
@@ -237,7 +243,7 @@ angular.module('Application').controller('AppsController', ['$scope', '$location
             cert: $scope.appConfigure.certificateFile,
             key: $scope.appConfigure.keyFile,
             xFrameOptions: $scope.appConfigure.xFrameOptions ? ('ALLOW-FROM ' + $scope.appConfigure.xFrameOptions) : 'SAMEORIGIN',
-            memoryLimit: $scope.appConfigure.memoryLimit,
+            memoryLimit: $scope.appConfigure.memoryLimit === $scope.appConfigure.memoryTicks[0] ? 0 : $scope.appConfigure.memoryLimit,
             oauthProxy:  $scope.appConfigure.needsOAuthProxy && $scope.appConfigure.accessRestrictionOption !== 'unrestricted'
         };