Move config removal to sending part

Signed-off-by: Joas Schilling <coding@schilljs.com>

2 files changed, 2 insertions, 1 deletions

diff --git a/lib/Listener/UserEnabledListener.php b/lib/Listener/UserEnabledListener.php
index c7495aa..9ff5b1c 100644
--- a/lib/Listener/UserEnabledListener.php
+++ b/lib/Listener/UserEnabledListener.php
@@ -56,7 +56,6 @@ class UserEnabledListener implements IEventListener {
 		$user = $event->getUser();
 		$value = $this->config->getUserValue($user->getUID(), Application::APP_ID, 'send_welcome_mail_on_enable', 'no');
 		if ($value === 'yes') {
-			$this->config->deleteUserValue($user->getUID(), Application::APP_ID, 'send_welcome_mail_on_enable');
 			$this->registrationService->sendWelcomeMail($event->getUser());
 		}
 	}
diff --git a/lib/Service/RegistrationService.php b/lib/Service/RegistrationService.php
index f0a5270..3eefa6d 100644
--- a/lib/Service/RegistrationService.php
+++ b/lib/Service/RegistrationService.php
@@ -440,6 +440,8 @@ class RegistrationService {
 	}
 
 	public function sendWelcomeMail(IUser $user): void {
+		$this->config->deleteUserValue($user->getUID(), Application::APP_ID, 'send_welcome_mail_on_enable');
+
 		if ($this->config->getAppValue('core', 'newUser.sendEmail', 'yes') === 'yes') {
 			/** @var NewUserMailHelper $helper */
 			$helper = \OC::$server->get(NewUserMailHelper::class);