diff --git a/docs/v3.x/deployment/amazon-aws.md b/docs/v3.x/deployment/amazon-aws.md
index c5fb746738..7890322f0f 100644
--- a/docs/v3.x/deployment/amazon-aws.md
+++ b/docs/v3.x/deployment/amazon-aws.md
@@ -330,7 +330,7 @@ module.exports = ({ env }) => ({
 This plugin will allow configurations for each active environment.
 
 ```bash
-npm install strapi-provider-upload-aws-s3@beta
+npm install strapi-provider-upload-aws-s3
 ```
 
 #### 4. Push your local changes to your project's GitHub repository.
diff --git a/docs/v3.x/plugins/email.md b/docs/v3.x/plugins/email.md
index dfb32c5f25..e09acb9ac6 100644
--- a/docs/v3.x/plugins/email.md
+++ b/docs/v3.x/plugins/email.md
@@ -35,7 +35,7 @@ To install a new provider run:
 ::: tab yarn
 
 ```
-yarn add strapi-provider-email-sendgrid@beta --save
+yarn add strapi-provider-email-sendgrid --save
 ```
 
 :::
@@ -43,7 +43,7 @@ yarn add strapi-provider-email-sendgrid@beta --save
 ::: tab npm
 
 ```
-npm install strapi-provider-email-sendgrid@beta --save
+npm install strapi-provider-email-sendgrid --save
 ```
 
 :::
diff --git a/packages/strapi-plugin-email/controllers/Email.js b/packages/strapi-plugin-email/controllers/Email.js
index 5c84829647..f574093921 100644
--- a/packages/strapi-plugin-email/controllers/Email.js
+++ b/packages/strapi-plugin-email/controllers/Email.js
@@ -8,7 +8,15 @@
 module.exports = {
   send: async ctx => {
     let options = ctx.request.body;
-    await strapi.plugins.email.services.email.send(options);
+    try {
+      await strapi.plugins.email.services.email.send(options);
+    } catch (e) {
+      if (e.statusCode === 400) {
+        return ctx.badRequest(e.message);
+      } else {
+        throw new Error(`Couldn't send email: ${e.message}.`);
+      }
+    }
 
     // Send 200 `ok`
     ctx.send({});
diff --git a/packages/strapi-provider-email-amazon-ses/lib/index.js b/packages/strapi-provider-email-amazon-ses/lib/index.js
index a098310c5c..7c4de41487 100644
--- a/packages/strapi-provider-email-amazon-ses/lib/index.js
+++ b/packages/strapi-provider-email-amazon-ses/lib/index.js
@@ -26,7 +26,7 @@ module.exports = {
 
           client.sendEmail(removeUndefined(msg), function(err) {
             if (err) {
-              reject([{ messages: [{ id: 'Auth.form.error.email.invalid' }] }]);
+              reject(err);
             } else {
               resolve();
             }
diff --git a/packages/strapi-provider-email-mailgun/lib/index.js b/packages/strapi-provider-email-mailgun/lib/index.js
index 092aa8b7f4..da444a7b8c 100644
--- a/packages/strapi-provider-email-mailgun/lib/index.js
+++ b/packages/strapi-provider-email-mailgun/lib/index.js
@@ -29,7 +29,7 @@ module.exports = {
 
           mailgun.messages().send(removeUndefined(msg), function(err) {
             if (err) {
-              reject([{ messages: [{ id: 'Auth.form.error.email.invalid' }] }]);
+              reject(err);
             } else {
               resolve();
             }
diff --git a/packages/strapi-provider-email-sendgrid/lib/index.js b/packages/strapi-provider-email-sendgrid/lib/index.js
index 4b28736ff6..66473ff06b 100644
--- a/packages/strapi-provider-email-sendgrid/lib/index.js
+++ b/packages/strapi-provider-email-sendgrid/lib/index.js
@@ -26,7 +26,7 @@ module.exports = {
 
           sendgrid.send(removeUndefined(msg), function(err) {
             if (err) {
-              reject([{ messages: [{ id: 'Auth.form.error.email.invalid' }] }]);
+              reject(err);
             } else {
               resolve();
             }
diff --git a/packages/strapi-provider-email-sendmail/lib/index.js b/packages/strapi-provider-email-sendmail/lib/index.js
index 84d49f8bc3..0df7ec03f8 100644
--- a/packages/strapi-provider-email-sendmail/lib/index.js
+++ b/packages/strapi-provider-email-sendmail/lib/index.js
@@ -28,7 +28,7 @@ module.exports = {
 
           sendmail(removeUndefined(msg), err => {
             if (err) {
-              reject([{ messages: [{ id: 'Auth.form.error.email.invalid' }] }]);
+              reject(err);
             } else {
               resolve();
             }