From f8d76d66c3bd0e92f52378608fbefe6fe2516dba Mon Sep 17 00:00:00 2001
From: ricardo <ricardoespinoza105@gmail.com>
Date: Thu, 14 Apr 2022 18:09:31 -0400
Subject: [PATCH] :zap: Improvements

---
 packages/cli/src/PublicApi/middlewares.ts             | 2 +-
 packages/cli/src/PublicApi/v1/handlers/Users/index.ts | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/packages/cli/src/PublicApi/middlewares.ts b/packages/cli/src/PublicApi/middlewares.ts
index fef9f5a3c0..2ede9abb23 100644
--- a/packages/cli/src/PublicApi/middlewares.ts
+++ b/packages/cli/src/PublicApi/middlewares.ts
@@ -108,7 +108,7 @@ const getMailerInstance = async (
 	} catch (error) {
 		if (error instanceof Error) {
 			return res.status(500).json({
-				message: 'Email sending must be set up in order to request a password reset email',
+				message: 'There is a problem with your SMTP setup',
 			});
 		}
 	}
diff --git a/packages/cli/src/PublicApi/v1/handlers/Users/index.ts b/packages/cli/src/PublicApi/v1/handlers/Users/index.ts
index 19669744fa..73140e21e5 100644
--- a/packages/cli/src/PublicApi/v1/handlers/Users/index.ts
+++ b/packages/cli/src/PublicApi/v1/handlers/Users/index.ts
@@ -66,6 +66,12 @@ export = {
 				includeRole,
 			});
 
+			if (apiKeyUserOwner.id === idToDelete) {
+				return res.status(400).json({
+					message: 'Cannot delete your own user',
+				});
+			}
+
 			if (!users?.length || (transferId !== '' && users.length !== 2)) {
 				return res.status(400).json({
 					message: