diff --git a/apps/settings/src/components/Users/UserRow.vue b/apps/settings/src/components/Users/UserRow.vue
index d3a0f0ce009f1..5c931c056360d 100644
--- a/apps/settings/src/components/Users/UserRow.vue
+++ b/apps/settings/src/components/Users/UserRow.vue
@@ -409,7 +409,11 @@ function enableDisableUser() {
 function sendWelcomeMail() {
 	loading.all = true
 	store.dispatch('sendWelcomeMail', props.user.id)
-		.then(() => showSuccess(t('settings', 'Welcome mail sent!'), { timeout: 2000 }))
+		.then((sent) => {
+			if (sent) {
+				showSuccess(t('settings', 'Welcome mail sent!'), { timeout: 2000 })
+			}
+		})
 		.finally(() => {
 			loading.all = false
 		})
diff --git a/apps/settings/src/store/users.js b/apps/settings/src/store/users.js
index cc0d20bee7c65..76d78aa8b05c2 100644
--- a/apps/settings/src/store/users.js
+++ b/apps/settings/src/store/users.js
@@ -907,11 +907,13 @@ const actions = {
 	 * @return {Promise}
 	 */
 	sendWelcomeMail(context, userid) {
-		return api.requireAdmin().then(() => {
-			return api.post(generateOcsUrl('cloud/users/{userid}/welcome', { userid }))
-				.then(() => true)
-				.catch((error) => { throw error })
-		}).catch((error) => context.commit('API_FAILURE', { userid, error }))
+		return api.requireAdmin()
+			.then(() => api.post(generateOcsUrl('cloud/users/{userid}/welcome', { userid })))
+			.then(() => true)
+			.catch((error) => {
+				context.commit('API_FAILURE', { userid, error })
+				return false
+			})
 	},
 	/**
 	 * Migrate local storage keys to database