diff --git a/src/js/client.js b/src/js/client.js
index 1e1fdfd71..91f18fe56 100644
--- a/src/js/client.js
+++ b/src/js/client.js
@@ -1016,8 +1016,8 @@ angular.module('Application').service('Client', ['$http', '$interval', '$timeout
         });
     };
 
-    Client.prototype.configureService = function (serviceName, memoryLimit, callback) {
-        post('/api/v1/services/' + serviceName, { memory: memoryLimit }, null, function (error, data, status) {
+    Client.prototype.configureService = function (serviceName, data, callback) {
+        post('/api/v1/services/' + serviceName, data, null, function (error, data, status) {
             if (error) return callback(error);
             if (status !== 202) return callback(new ClientError(status, data));
 
diff --git a/src/views/app.html b/src/views/app.html
index c02834eb9..322589e76 100644
--- a/src/views/app.html
+++ b/src/views/app.html
@@ -544,7 +544,6 @@
                 <div class="form-group">
                   <label class="control-label" for="memoryLimit">Memory Limit <sup><a ng-href="{{ config.webServerOrigin }}/documentation/apps/#memory-limit" class="help" target="_blank"><i class="fa fa-question-circle"></i></a></sup> : <b>{{ resources.memoryLimit ? resources.memoryLimit / 1024 / 1024 + 'MB' : 'Default (256 MB)' }}</b></label>
                   <p>Cloudron allocates 50% of this value as RAM and 50% as swap.</p>
-                  <br/>
                   <div style="padding: 0 10px;">
                     <slider id="memoryLimit" ng-model="resources.memoryLimit" step="134217728" tooltip="hide" ticks="resources.memoryTicks" ticks-snap-bounds="67108864"></slider>
                   </div>
diff --git a/src/views/system.html b/src/views/system.html
index 93931fcb5..0eea4d1b6 100644
--- a/src/views/system.html
+++ b/src/views/system.html
@@ -30,8 +30,7 @@
 
             <div class="form-group">
               <label class="control-label" for="memoryLimit">Memory Limit : <b>{{ serviceConfigure.memoryLimit / 1024 / 1024 + 'MB' }}</b></label>
-              <p>Cloudron allocates 50% of this value as RAM and 50% as swap.</p>
-              <br/>
+              <p><small>Cloudron allocates 50% of this value as RAM and 50% as swap.</small></p>
               <div style="padding: 0 10px;">
                 <slider id="memoryLimit" ng-model="serviceConfigure.memoryLimit" step="134217728" tooltip="hide" ticks="serviceConfigure.memoryTicks" ticks-snap-bounds="67108864"></slider>
               </div>
@@ -106,7 +105,7 @@
                     </div>
                   </td>
                   <td class="elide-table-cell text-center">
-                    <span ng-show="service.config.memory">{{ service.config.memory / 1024 / 1024 + ' MB' }}</span>
+                    <span ng-show="service.config.memory">{{ service.config.memorySwap / 1024 / 1024 + ' MB' }}</span>
                   </td>
                   <td class="text-right no-wrap" style="vertical-align: bottom">
                     <button class="btn btn-xs btn-default" ng-click="serviceConfigure.show(service)" uib-tooltip="Configure Memory Limit" ng-show="service.config.memory"><i class="fa fa-pencil-alt"></i></button>
diff --git a/src/views/system.js b/src/views/system.js
index 526a5eb14..4396b6b11 100644
--- a/src/views/system.js
+++ b/src/views/system.js
@@ -89,7 +89,7 @@ angular.module('Application').controller('SystemController', ['$scope', '$locati
             $scope.serviceConfigure.reset();
 
             $scope.serviceConfigure.service = service;
-            $scope.serviceConfigure.memoryLimit = service.config.memory;
+            $scope.serviceConfigure.memoryLimit = service.config.memorySwap; // memory + swap
 
             // TODO improve those
             $scope.serviceConfigure.memoryTicks = [];
@@ -109,7 +109,7 @@ angular.module('Application').controller('SystemController', ['$scope', '$locati
             $scope.serviceConfigure.busy = true;
             $scope.serviceConfigure.error = null;
 
-            Client.configureService($scope.serviceConfigure.service.name, memoryLimit, function (error) {
+            Client.configureService($scope.serviceConfigure.service.name, { memorySwap: memoryLimit, memory: memoryLimit/2 }, function (error) {
                 $scope.serviceConfigure.busy = false;
                 if (error) {
                     $scope.serviceConfigure.error = error.message;