diff --git a/lib/redux/credit/credit_actions.dart b/lib/redux/credit/credit_actions.dart
index be862b374..e77c38359 100644
--- a/lib/redux/credit/credit_actions.dart
+++ b/lib/redux/credit/credit_actions.dart
@@ -514,7 +514,7 @@ Future handleCreditAction(
       } else {
         confirmCallback(
             context: context,
-            message: localization.bulkEmailCredit,
+            message: localization.bulkEmailCredits,
             callback: (_) {
               store.dispatch(BulkEmailCreditsRequest(
                   snackBarCompleter<Null>(
diff --git a/lib/redux/invoice/invoice_actions.dart b/lib/redux/invoice/invoice_actions.dart
index 53a98bb28..794847c58 100644
--- a/lib/redux/invoice/invoice_actions.dart
+++ b/lib/redux/invoice/invoice_actions.dart
@@ -600,7 +600,7 @@ void handleInvoiceAction(BuildContext context, List<BaseEntity> invoices,
       } else {
         confirmCallback(
             context: context,
-            message: localization.bulkEmailInvoice,
+            message: localization.bulkEmailInvoices,
             callback: (_) {
               store.dispatch(BulkEmailInvoicesRequest(
                   snackBarCompleter<Null>(
diff --git a/lib/redux/purchase_order/purchase_order_actions.dart b/lib/redux/purchase_order/purchase_order_actions.dart
index a71eebcb6..f5371d4b4 100644
--- a/lib/redux/purchase_order/purchase_order_actions.dart
+++ b/lib/redux/purchase_order/purchase_order_actions.dart
@@ -704,7 +704,7 @@ void handlePurchaseOrderAction(BuildContext context,
       } else {
         confirmCallback(
             context: context,
-            message: localization.bulkEmailQuote,
+            message: localization.bulkEmailPurchaseOrders,
             callback: (_) {
               store.dispatch(BulkEmailPurchaseOrdersRequest(
                   snackBarCompleter<Null>(
diff --git a/lib/redux/quote/quote_actions.dart b/lib/redux/quote/quote_actions.dart
index 3d4d88e52..cad34df03 100644
--- a/lib/redux/quote/quote_actions.dart
+++ b/lib/redux/quote/quote_actions.dart
@@ -553,7 +553,7 @@ Future handleQuoteAction(
       } else {
         confirmCallback(
             context: context,
-            message: localization.bulkEmailQuote,
+            message: localization.bulkEmailQuotes,
             callback: (_) {
               store.dispatch(BulkEmailQuotesRequest(
                   snackBarCompleter<Null>(
diff --git a/lib/ui/settings/user_details.dart b/lib/ui/settings/user_details.dart
index ee44ce3e4..652da05c2 100644
--- a/lib/ui/settings/user_details.dart
+++ b/lib/ui/settings/user_details.dart
@@ -764,6 +764,7 @@ class __SmsVerificationState extends State<_SmsVerification> {
       setState(() {
         _isLoading = false;
       });
+      Navigator.of(context).pop();
       showErrorDialog(context: context, message: error);
     });
   }
diff --git a/lib/utils/i18n.dart b/lib/utils/i18n.dart
index 8cdd0f50e..de65c069b 100644
--- a/lib/utils/i18n.dart
+++ b/lib/utils/i18n.dart
@@ -82,7 +82,7 @@ mixin LocalizationsProvider on LocaleCodeAware {
       'please_select_a_vendor': 'Please select a vendor',
       'purchase_order_total': 'Purchase Order Total',
       'email_purchase_order': 'Email Purchase Order',
-      'bulk_email_purchase_order': 'Email Purchase Order',
+      'bulk_email_purchase_orders': 'Email Purchase Orders',
       'disconnected_email': 'Successfully disconnected email',
       'connect_email': 'Connect Email',
       'disconnect_email': 'Disconnect Email',
@@ -300,9 +300,9 @@ mixin LocalizationsProvider on LocaleCodeAware {
       'app': 'App',
       'for_best_performance': 'For the best performance download the :app app',
       'gross_line_total': 'Gross Line Total',
-      'bulk_email_invoice': 'Email Invoice',
-      'bulk_email_quote': 'Email Quote',
-      'bulk_email_credit': 'Email Credit',
+      'bulk_email_invoices': 'Email Invoices',
+      'bulk_email_quotes': 'Email Quotes',
+      'bulk_email_credits': 'Email Credits',
       'from_name': 'From Name',
       'clone_to_expense': 'Clone to Expense',
       'recurring_expense': 'Recurring Expense',
@@ -84283,17 +84283,17 @@ mixin LocalizationsProvider on LocaleCodeAware {
       _localizedValues[localeCode]['from_name'] ??
       _localizedValues['en']['from_name'];
 
-  String get bulkEmailInvoice =>
-      _localizedValues[localeCode]['bulk_email_invoice'] ??
-      _localizedValues['en']['bulk_email_invoice'];
+  String get bulkEmailInvoices =>
+      _localizedValues[localeCode]['bulk_email_invoices'] ??
+      _localizedValues['en']['bulk_email_invoices'];
 
-  String get bulkEmailQuote =>
-      _localizedValues[localeCode]['bulk_email_quote'] ??
-      _localizedValues['en']['bulk_email_quote'];
+  String get bulkEmailQuotes =>
+      _localizedValues[localeCode]['bulk_email_quotes'] ??
+      _localizedValues['en']['bulk_email_quotes'];
 
-  String get bulkEmailCredit =>
-      _localizedValues[localeCode]['bulk_email_credit'] ??
-      _localizedValues['en']['bulk_email_credit'];
+  String get bulkEmailCredits =>
+      _localizedValues[localeCode]['bulk_email_credits'] ??
+      _localizedValues['en']['bulk_email_credits'];
 
   String get grossLineTotal =>
       _localizedValues[localeCode]['gross_line_total'] ??
@@ -85238,9 +85238,13 @@ mixin LocalizationsProvider on LocaleCodeAware {
       _localizedValues[localeCode]['code_was_sent'] ??
       _localizedValues['en']['code_was_sent'];
 
-        String get pleaseEnterACode =>
-      _localizedValues[localeCode]['please_enter_a_code'] ?? _localizedValues['en']['please_enter_a_code'];
+  String get pleaseEnterACode =>
+      _localizedValues[localeCode]['please_enter_a_code'] ??
+      _localizedValues['en']['please_enter_a_code'];
 
+  String get bulkEmailPurchaseOrders =>
+      _localizedValues[localeCode]['bulk_email_purchase_orders'] ??
+      _localizedValues['en']['bulk_email_purchase_orders'];
 
 // STARTER: lang field - do not remove comment