diff --git a/lib/data/models/models.dart b/lib/data/models/models.dart
index 794187123..7111811e1 100644
--- a/lib/data/models/models.dart
+++ b/lib/data/models/models.dart
@@ -65,7 +65,7 @@ class EntityAction extends EnumClass {
   static const EntityAction bulkEmailInvoice = _$bulkEmailInvoice;
   static const EntityAction bulkEmailQuote = _$bulkEmailQuote;
   static const EntityAction bulkEmailCredit = _$bulkEmailCredit;
-  static const EntityAction bulkEmailPayment = _$bulkEmailPayment;
+  static const EntityAction emailPayment = _$emailPayment;
   static const EntityAction markSent = _$markSent;
   static const EntityAction markPaid = _$markPaid;
   static const EntityAction newClient = _$newClient;
diff --git a/lib/data/models/models.g.dart b/lib/data/models/models.g.dart
index 3e123d198..3ec60b198 100644
--- a/lib/data/models/models.g.dart
+++ b/lib/data/models/models.g.dart
@@ -31,8 +31,7 @@ const EntityAction _$bulkEmailInvoice =
     const EntityAction._('bulkEmailInvoice');
 const EntityAction _$bulkEmailQuote = const EntityAction._('bulkEmailQuote');
 const EntityAction _$bulkEmailCredit = const EntityAction._('bulkEmailCredit');
-const EntityAction _$bulkEmailPayment =
-    const EntityAction._('bulkEmailPayment');
+const EntityAction _$emailPayment = const EntityAction._('emailPayment');
 const EntityAction _$markSent = const EntityAction._('markSent');
 const EntityAction _$markPaid = const EntityAction._('markPaid');
 const EntityAction _$newClient = const EntityAction._('newClient');
@@ -114,8 +113,8 @@ EntityAction _$valueOf(String name) {
       return _$bulkEmailQuote;
     case 'bulkEmailCredit':
       return _$bulkEmailCredit;
-    case 'bulkEmailPayment':
-      return _$bulkEmailPayment;
+    case 'emailPayment':
+      return _$emailPayment;
     case 'markSent':
       return _$markSent;
     case 'markPaid':
@@ -205,7 +204,7 @@ final BuiltSet<EntityAction> _$values =
   _$bulkEmailInvoice,
   _$bulkEmailQuote,
   _$bulkEmailCredit,
-  _$bulkEmailPayment,
+  _$emailPayment,
   _$markSent,
   _$markPaid,
   _$newClient,
diff --git a/lib/data/models/payment_model.dart b/lib/data/models/payment_model.dart
index 3c6925a23..70e695a82 100644
--- a/lib/data/models/payment_model.dart
+++ b/lib/data/models/payment_model.dart
@@ -383,7 +383,7 @@ abstract class PaymentEntity extends Object
       bool multiselect = false}) {
     final actions = <EntityAction>[];
 
-    if (!isDeleted && !multiselect) {
+    if (!isDeleted) {
       if (userCompany.canEditEntity(this)) {
         if (!multiselect) {
           if (includeEdit) {
@@ -400,7 +400,7 @@ abstract class PaymentEntity extends Object
         }
 
         if (client != null && client.hasEmailAddress) {
-          actions.add(EntityAction.bulkEmailPayment);
+          actions.add(EntityAction.emailPayment);
         }
       }
     }
diff --git a/lib/redux/payment/payment_actions.dart b/lib/redux/payment/payment_actions.dart
index ceea6cd3d..2a304ea8f 100644
--- a/lib/redux/payment/payment_actions.dart
+++ b/lib/redux/payment/payment_actions.dart
@@ -343,7 +343,7 @@ void handlePaymentAction(
         ));
       });
       break;
-    case EntityAction.bulkEmailPayment:
+    case EntityAction.emailPayment:
       store.dispatch(EmailPaymentRequest(
           snackBarCompleter<Null>(context, localization.emailedPayment),
           paymentIds));
diff --git a/lib/redux/payment/payment_middleware.dart b/lib/redux/payment/payment_middleware.dart
index 8a60823d6..5d7d596a9 100644
--- a/lib/redux/payment/payment_middleware.dart
+++ b/lib/redux/payment/payment_middleware.dart
@@ -252,7 +252,7 @@ Middleware<AppState> _emailPayment(PaymentRepository repository) {
     final action = dynamicAction as EmailPaymentRequest;
     repository
         .bulkAction(store.state.credentials, action.paymentIds,
-            EntityAction.bulkEmailPayment)
+            EntityAction.emailPayment)
         .then((List<PaymentEntity> payments) {
       store.dispatch(EmailPaymentSuccess());
       action.completer.complete(null);
diff --git a/lib/utils/icons.dart b/lib/utils/icons.dart
index 1f8b4aa32..6e6c16e61 100644
--- a/lib/utils/icons.dart
+++ b/lib/utils/icons.dart
@@ -25,13 +25,13 @@ IconData getEntityActionIcon(EntityAction entityAction) {
       return Icons.public;
     case EntityAction.markPaid:
       return Icons.payment;
-    case EntityAction.bulkEmailPayment:
     case EntityAction.bulkEmailCredit:
     case EntityAction.bulkEmailInvoice:
     case EntityAction.bulkEmailQuote:
     case EntityAction.emailQuote:
     case EntityAction.emailInvoice:
     case EntityAction.emailCredit:
+    case EntityAction.emailPayment:
     case EntityAction.resendInvite:
       return Icons.send;
     case EntityAction.archive: