diff --git a/frontend/src/components/identities/AccountGeneralForm.vue b/frontend/src/components/identities/AccountGeneralForm.vue
index 6ef5fb71b..b680756ca 100644
--- a/frontend/src/components/identities/AccountGeneralForm.vue
+++ b/frontend/src/components/identities/AccountGeneralForm.vue
@@ -81,7 +81,6 @@ export default {
       return await this.$refs.observer.validate() && await this.$refs.passwordForm.validate()
     },
     update () {
-      console.log(this.form)
       this.$emit('input', this.form)
     }
   },
diff --git a/frontend/src/components/identities/AccountMailboxForm.vue b/frontend/src/components/identities/AccountMailboxForm.vue
index 6e69a0347..cab3c44f6 100644
--- a/frontend/src/components/identities/AccountMailboxForm.vue
+++ b/frontend/src/components/identities/AccountMailboxForm.vue
@@ -39,6 +39,18 @@
       @input="update"
       />
   </validation-provider>
+  <validation-provider
+    v-slot="{ errors }"
+    rules=""
+    >
+    <v-switch
+      v-model="form.mailbox.is_send_only"
+      :label="'Send only account' | translate"
+      dense
+      :error-messages="errors"
+      @input="update"
+      />
+  </validation-provider>
 </validation-observer>
 </template>
 
diff --git a/modoboa/admin/api/v2/serializers.py b/modoboa/admin/api/v2/serializers.py
index c4f12b446..8acfebd7f 100644
--- a/modoboa/admin/api/v2/serializers.py
+++ b/modoboa/admin/api/v2/serializers.py
@@ -393,6 +393,7 @@ class MailboxSerializer(serializers.ModelSerializer):
         model = models.Mailbox
         fields = (
             "pk", "use_domain_quota", "quota", "message_limit",
+            "is_send_only",
         )
 
     def validate_quota(self, value):
diff --git a/modoboa/admin/postfix_maps.py b/modoboa/admin/postfix_maps.py
index 6b7131a35..ad8a04b85 100644
--- a/modoboa/admin/postfix_maps.py
+++ b/modoboa/admin/postfix_maps.py
@@ -99,23 +99,26 @@ class SendOnlyAccountMap(object):
     filename = "sql-send-only.cf"
     mysql = (
         "SELECT '550 Requested mail action not taken: mailbox disabled' "
-        "FROM admin_mailbox mb INNER JOIN admin_domain dom "
-        "ON mb.domain_id=dom.id "
-        "WHERE mb.is_send_only=1 AND dom.name='%d' AND mb.address='%u' "
+        "FROM modoboa_admin_aliasrecipient amb "
+        "INNER JOIN admin_mailbox mb "
+        "ON mb.id=amb.r_mailbox_id "
+        "WHERE mb.is_send_only=1 AND amb.address=CONCAT('%u', '@','%d') "
         "LIMIT 1"
     )
     postgres = (
         "SELECT '550 Requested mail action not taken: mailbox disabled' "
-        "FROM admin_mailbox mb INNER JOIN admin_domain dom "
-        "ON mb.domain_id=dom.id "
-        "WHERE mb.is_send_only AND dom.name='%d' AND mb.address='%u' "
+        "FROM modoboa_admin_aliasrecipient amb "
+        "INNER JOIN admin_mailbox mb "
+        "ON mb.id=amb.r_mailbox_id "
+        "WHERE mb.is_send_only AND amb.address='%u' || '@' || '%d' "
         "LIMIT 1"
     )
     sqlite = (
         "SELECT '550 Requested mail action not taken: mailbox disabled' "
-        "FROM admin_mailbox mb INNER JOIN admin_domain dom "
-        "ON mb.domain_id=dom.id "
-        "WHERE mb.is_send_only=1 AND dom.name='%d' AND mb.address='%u' "
+        "FROM modoboa_admin_aliasrecipient amb "
+        "INNER JOIN admin_mailbox mb "
+        "ON mb.id=amb.r_mailbox_id "
+        "WHERE mb.is_send_only=1 AND mb.address='%u' || '@' || '%d' "
         "LIMIT 1"
     )