diff --git a/src/translation/en.json b/src/translation/en.json
index ec6c9635d..10cbd1434 100644
--- a/src/translation/en.json
+++ b/src/translation/en.json
@@ -17,7 +17,8 @@
         "stateFilterHeader": "All States",
         "tagsFilterHeader": "Tags: {{ tags }}",
         "tagsFilterHeaderAll": "All Tags",
-        "domainsFilterHeader": "All Domains"
+        "domainsFilterHeader": "All Domains",
+        "groupsFilterHeader": "Select Group"
     },
     "main": {
         "offline": "Cloudron is offline. Reconnecting…",
diff --git a/src/translation/es.json b/src/translation/es.json
index 554c32e1a..96c60f1b8 100644
--- a/src/translation/es.json
+++ b/src/translation/es.json
@@ -732,7 +732,9 @@
             "memoryTitle": "Memoria (RAM + Swap) en Mb"
         },
         "states": {
-            "running": "En funcionamiento"
+            "running": "En funcionamiento",
+            "notResponding": "No responden",
+            "stopped": "Paradas"
         },
         "displayTabTitle": "Presentación",
         "backups": {
@@ -745,6 +747,9 @@
                 "time": "Creado en",
                 "packageVersion": "Versión del Paquete",
                 "title": "Copias de Seguridad"
+            },
+            "import": {
+                "title": "Importar desde una Copia de Seguridad Externa"
             }
         },
         "security": {
@@ -834,7 +839,8 @@
         "it": "Italiano",
         "fr": "Francés",
         "de": "Alemán",
-        "en": "Inglés"
+        "en": "Inglés",
+        "es": "Español"
     },
     "system": {
         "title": "Información del Sistema",
@@ -921,9 +927,18 @@
             "catchall": {
                 "subscriptionRequired": "Esta funcionalidad solo está disponible en planes de pago. <a href=\"\" class=\"pull-right\" ng-click=\"openSubscriptionSetup()\">Suscríbete Ahora</a>"
             }
+        },
+        "outbound": {
+            "noopAdminDomainWarning": "Cloudron no puede enviar invitaciones de usuario, restablecimiento de contraseña y otras notificaciones cuando el correo electrónico está deshabilitado en el dominio principal"
         }
     },
     "passwordResetEmail": {
         "expireNote": "Tenga en cuenta que el enlace para restablecer la contraseña caducará en 24 horas."
+    },
+    "notifications": {
+        "clearAll": "Borrar todo",
+        "dismissTooltip": "Descartar",
+        "title": "Notificaciones",
+        "nonePending": "No hay notificaciones!"
     }
 }
diff --git a/src/translation/nl.json b/src/translation/nl.json
index d99745497..08a4e8d73 100644
--- a/src/translation/nl.json
+++ b/src/translation/nl.json
@@ -1418,7 +1418,8 @@
         "nl": "Nederlands",
         "zh_Hans": "Chinees (vereenvoudigd)",
         "vi": "Vietnamees",
-        "pl": "Pools"
+        "pl": "Pools",
+        "es": "Spaans"
     },
     "passwordResetEmail": {
         "subject": "[<%= cloudron %>] Wachtwoord herstellen",
diff --git a/src/views/apps.html b/src/views/apps.html
index fc6d2995a..c3d69ad61 100644
--- a/src/views/apps.html
+++ b/src/views/apps.html
@@ -107,7 +107,7 @@
         <div class="pull-right">
           <form class="form-inline">
             <input type="text" class="form-control" ng-show="installedApps.length > 8" placeholder="{{ 'apps.searchPlaceholder' | tr }}" id="appSearch" ng-model="appSearch"/>
-            <multiselect ng-model="selectedGroup" ng-show="installedApps.length > 1" ms-header="{{ selectedGroup.name }}" options="group.name for group in groups" data-multiple="false" filter-after-rows="5" scroll-after-rows="10"></multiselect>
+            <multiselect ng-model="selectedGroup" ng-show="installedApps.length > 1 && groups.length > 0" ms-header="{{ selectedGroup.name }}" options="group.name for group in groups" data-multiple="false" filter-after-rows="5" scroll-after-rows="10"></multiselect>
             <multiselect ng-model="selectedState" ng-show="installedApps.length > 1" ms-header="{{ 'apps.stateFilterHeader' | tr }}" ms-selected="{{ selectedState }}" options="state.label for state in states" data-multiple="false"></multiselect>
             <multiselect ng-model="selectedTags" ng-show="tags.length > 0" ms-header="{{ 'apps.tagsFilterHeaderAll' | tr }}" ms-selected="{{ 'apps.tagsFilterHeader' | tr:{ tags: selectedTags.join(', ') } }}" options="tag for tag in tags" data-multiple="true" filter-after-rows="5" scroll-after-rows="10"></multiselect>
             <multiselect ng-model="selectedDomain" ng-show="filterDomains.length > 2" data-compare-by="domain" ms-selected="{{ selectedDomain.domain }}" options="domain.domain for domain in filterDomains" data-multiple="false" filter-after-rows="5" scroll-after-rows="10"></multiselect>
diff --git a/src/views/apps.js b/src/views/apps.js
index e27d9d2a5..b5fba7317 100644
--- a/src/views/apps.js
+++ b/src/views/apps.js
@@ -5,7 +5,7 @@
 
 angular.module('Application').controller('AppsController', ['$scope', '$translate', '$interval', '$location', 'Client', function ($scope, $translate, $interval, $location, Client) {
     var ALL_DOMAINS_DOMAIN = { _alldomains: true, domain: 'All Domains' }; // dummy record for the single select filter
-    var GROUP_ACCESS_UNSET = { _unset: true, name: 'No Group Filter' }; // dummy record for the single select filter
+    var GROUP_ACCESS_UNSET = { _unset: true, name: 'Select Group' }; // dummy record for the single select filter
 
     $scope.installedApps = Client.getInstalledApps();
     $scope.tags = Client.getAppTags();
@@ -26,8 +26,9 @@ angular.module('Application').controller('AppsController', ['$scope', '$translat
     $scope.appSearch = '';
     $scope.groups = [ GROUP_ACCESS_UNSET ];
 
-    $translate(['apps.stateFilterHeader', 'apps.domainsFilterHeader', 'app.states.running', 'app.states.stopped', 'app.states.notResponding']).then(function (tr) {
+    $translate(['apps.stateFilterHeader', 'apps.domainsFilterHeader', 'apps.groupsFilterHeader', 'app.states.running', 'app.states.stopped', 'app.states.notResponding']).then(function (tr) {
         if (tr['apps.domainsFilterHeader']) ALL_DOMAINS_DOMAIN.domain = tr['apps.domainsFilterHeader'];
+        if (tr['apps.groupsFilterHeader']) GROUP_ACCESS_UNSET.name = tr['apps.groupsFilterHeader'];
         if (tr['apps.stateFilterHeader']) $scope.states[0].label = tr['apps.stateFilterHeader'];
         if (tr['app.states.running']) $scope.states[1].label = tr['app.states.running'];
         if (tr['app.states.stopped']) $scope.states[2].label = tr['app.states.stopped'];