diff --git a/src/views/emails.js b/src/views/emails.js
index d54706c98..b2c75481c 100644
--- a/src/views/emails.js
+++ b/src/views/emails.js
@@ -225,7 +225,7 @@ angular.module('Application').controller('EmailsController', ['$scope', '$locati
             Client.getService('mail', function (error, result) {
                 if (error) return console.log('Error getting status of mail conatiner', error);
 
-                $scope.solrConfig.enoughMemory = result.config.memorySwap > (1024*1024*1024*2);
+                $scope.solrConfig.enoughMemory = result.config.memoryLimit > (1024*1024*1024*2);
                 $scope.solrConfig.running = result.healthcheck && result.healthcheck.solr.status;
 
                 Client.getSolrConfig(function (error, config) {
diff --git a/src/views/services.html b/src/views/services.html
index f0913f2c4..38029e57d 100644
--- a/src/views/services.html
+++ b/src/views/services.html
@@ -94,15 +94,15 @@
                     {{ service.displayName }}
                   </td>
                   <td class="elide-table-cell">
-                    <div class="progress progress-striped" ng-show="service.config.memory">
+                    <div class="progress progress-striped" ng-show="service.config.memoryLimit">
                       <div class="progress-bar progress-bar-success" role="progressbar" style="width: {{ service.memoryPercent }}%"></div>
                     </div>
                   </td>
                   <td class="elide-table-cell text-center">
-                    <span ng-show="service.config.memory">{{ service.config.memorySwap | prettyByteSize }}</span>
+                    <span ng-show="service.config.memoryLimit">{{ service.config.memoryLimit | prettyByteSize }}</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="{{ 'services.configureActionTooltip' | tr }}" ng-show="service.config.memory"><i class="fa fa-pencil-alt"></i></button>
+                    <button class="btn btn-xs btn-default" ng-click="serviceConfigure.show(service)" uib-tooltip="{{ 'services.configureActionTooltip' | tr }}" ng-show="service.config.memoryLimit"><i class="fa fa-pencil-alt"></i></button>
                     <button class="btn btn-xs btn-default" ng-click="restartService(service.name)" uib-tooltip="{{ 'services.restartActionTooltip' | tr }}"><i class="fa fa-sync-alt" ng-class="{ 'fa-spin': service.status === 'starting' }"></i></button>
                     <a class="btn btn-xs btn-default" ng-href="{{ '/logs.html?id=' + service.name }}" target="_blank" uib-tooltip="{{ 'logs.title' | tr }}"><i class="fa fa-file-alt"></i></a>
                   </td>
@@ -122,15 +122,15 @@
                     {{ service.displayName }}
                   </td>
                   <td class="elide-table-cell">
-                    <div class="progress progress-striped" ng-show="service.config.memory">
+                    <div class="progress progress-striped" ng-show="service.config.memoryLimit">
                       <div class="progress-bar progress-bar-success" role="progressbar" style="width: {{ service.memoryPercent }}%"></div>
                     </div>
                   </td>
                   <td class="elide-table-cell text-center">
-                    <span ng-show="service.config.memory">{{ service.config.memorySwap | prettyByteSize }}</span>
+                    <span ng-show="service.config.memoryLimit">{{ service.config.memoryLimit | prettyByteSize }}</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="{{ 'services.configureActionTooltip' | tr }}" ng-show="service.config.memory"><i class="fa fa-pencil-alt"></i></button>
+                    <button class="btn btn-xs btn-default" ng-click="serviceConfigure.show(service)" uib-tooltip="{{ 'services.configureActionTooltip' | tr }}" ng-show="service.config.memoryLimit"><i class="fa fa-pencil-alt"></i></button>
                     <button class="btn btn-xs btn-default" ng-click="restartService(service.name)" uib-tooltip="{{ 'services.restartActionTooltip' | tr }}"><i class="fa fa-sync-alt" ng-class="{ 'fa-spin': service.status === 'starting' }"></i></button>
                     <a class="btn btn-xs btn-default" ng-href="{{ '/logs.html?id=' + service.name }}" target="_blank" uib-tooltip="{{ 'logs.title' | tr }}"><i class="fa fa-file-alt"></i></a>
                   </td>
diff --git a/src/views/services.js b/src/views/services.js
index 88295fc0d..33efd7c58 100644
--- a/src/views/services.js
+++ b/src/views/services.js
@@ -66,7 +66,7 @@ angular.module('Application').controller('ServicesController', ['$scope', '$loca
             $scope.serviceConfigure.reset();
 
             $scope.serviceConfigure.service = service;
-            $scope.serviceConfigure.memoryLimit = service.config.memorySwap; // memory + swap
+            $scope.serviceConfigure.memoryLimit = service.config.memoryLimit;
 
             // TODO improve those
             $scope.serviceConfigure.memoryTicks = [];
@@ -88,7 +88,7 @@ angular.module('Application').controller('ServicesController', ['$scope', '$loca
             $scope.serviceConfigure.busy = true;
             $scope.serviceConfigure.error = null;
 
-            var data = { memorySwap: memoryLimit, memory: memoryLimit/2 };
+            var data = { memoryLimit: memoryLimit };
             if ($scope.serviceConfigure.service.name === 'sftp') data.requireAdmin = $scope.serviceConfigure.requireAdmin;
 
             Client.configureService($scope.serviceConfigure.service.name, data, function (error) {