diff --git a/core/Command/User/Add.php b/core/Command/User/Add.php
index b670756c7aef1..fedffbba04f5b 100644
--- a/core/Command/User/Add.php
+++ b/core/Command/User/Add.php
@@ -7,6 +7,7 @@
  * @author Joas Schilling <coding@schilljs.com>
  * @author Laurens Post <lkpost@scept.re>
  * @author Roeland Jago Douma <roeland@famdouma.nl>
+ * @author Anupam Kumar <kyteinsky@gmail.com>
  *
  * @license AGPL-3.0
  *
@@ -46,63 +47,16 @@
 use Symfony\Component\Console\Question\Question;
 
 class Add extends Command {
-	/**
-	 * @var IUserManager
-	 */
-	protected $userManager;
-
-	/**
-	 * @var IGroupManager
-	 */
-	protected $groupManager;
-
-	/**
-	 * @var EmailValidator
-	 */
-	protected $emailValidator;
-
-	/**
-	 * @var IConfig
-	 */
-	private $config;
-
-	/**
-	 * @var NewUserMailHelper
-	 */
-	private $mailHelper;
-
-	/**
-	 * @var IEventDispatcher
-	 */
-	private $eventDispatcher;
-
-	/**
-	 * @var ISecureRandom
-	 */
-	private $secureRandom;
-
-	/**
-	 * @param IUserManager $userManager
-	 * @param IGroupManager $groupManager
-	 * @param EmailValidator $emailValidator
-	 */
 	public function __construct(
-		IUserManager $userManager,
-		IGroupManager $groupManager,
-		EmailValidator $emailValidator,
-		IConfig $config,
-		NewUserMailHelper $mailHelper,
-		IEventDispatcher $eventDispatcher,
-		ISecureRandom $secureRandom
+		protected IUserManager $userManager,
+		protected IGroupManager $groupManager,
+		protected EmailValidator $emailValidator,
+		private IConfig $config,
+		private NewUserMailHelper $mailHelper,
+		private IEventDispatcher $eventDispatcher,
+		private ISecureRandom $secureRandom
 	) {
 		parent::__construct();
-		$this->userManager = $userManager;
-		$this->groupManager = $groupManager;
-		$this->emailValidator = $emailValidator;
-		$this->config = $config;
-		$this->mailHelper = $mailHelper;
-		$this->eventDispatcher = $eventDispatcher;
-		$this->secureRandom = $secureRandom;
 	}
 
 	protected function configure() {
@@ -142,16 +96,14 @@ protected function configure() {
 
 	protected function execute(InputInterface $input, OutputInterface $output): int {
 		$uid = $input->getArgument('uid');
-		$emailIsSet = \is_string($input->getOption('email')) && \mb_strlen($input->getOption('email')) > 0;
-		$emailIsValid = $this->emailValidator->isValid($input->getOption('email') ?? '', new RFCValidation());
-		$password = '';
-		$temporaryPassword = '';
-
 		if ($this->userManager->userExists($uid)) {
 			$output->writeln('<error>The user "' . $uid . '" already exists.</error>');
 			return 1;
 		}
 
+		$password = '';
+		$sendPasswordEmail = false;
+
 		if ($input->getOption('password-from-env')) {
 			$password = getenv('OC_PASS');
 
@@ -159,6 +111,24 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 				$output->writeln('<error>--password-from-env given, but OC_PASS is empty!</error>');
 				return 1;
 			}
+		} elseif (\mb_strlen($input->getOption('email')) > 0) {
+			if (!$this->emailValidator->isValid($input->getOption('email') ?? '', new RFCValidation())) {
+				$output->writeln(\sprintf(
+					'<error>The given E-Mail address "%s" is invalid: %s</error>',
+					$input->getOption('email'),
+					$this->emailValidator->getError()->description()
+				));
+
+				return 1;
+			}
+
+			$output->writeln('Setting a temporary password.');
+
+			$passwordEvent = new GenerateSecurePasswordEvent();
+			$this->eventDispatcher->dispatchTyped($passwordEvent);
+			$password = $passwordEvent->getPassword() ?? $this->secureRandom->generate(20);
+
+			$sendPasswordEmail = true;
 		} elseif ($input->isInteractive()) {
 			/** @var QuestionHelper $helper */
 			$helper = $this->getHelper('question');
@@ -180,26 +150,10 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 			return 1;
 		}
 
-		if (trim($password) === '' && $emailIsSet) {
-			if ($emailIsValid) {
-				$output->writeln('Setting a temporary password.');
-
-				$temporaryPassword = $this->getTemporaryPassword();
-			} else {
-				$output->writeln(\sprintf(
-					'<error>The given E-Mail address "%s" is invalid: %s</error>',
-					$input->getOption('email'),
-					$this->emailValidator->getError()->description()
-				));
-
-				return 1;
-			}
-		}
-
 		try {
 			$user = $this->userManager->createUser(
 				$input->getArgument('uid'),
-				$password ?: $temporaryPassword
+				$password,
 			);
 		} catch (\Exception $e) {
 			$output->writeln('<error>' . $e->getMessage() . '</error>');
@@ -218,23 +172,6 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 			$output->writeln(sprintf('Display name set to "%s"', $user->getDisplayName()));
 		}
 
-		if ($emailIsSet && $emailIsValid) {
-			$user->setSystemEMailAddress($input->getOption('email'));
-			$output->writeln(sprintf('E-Mail set to "%s"', (string) $user->getSystemEMailAddress()));
-
-			if (trim($password) === '' && $this->config->getAppValue('core', 'newUser.sendEmail', 'yes') === 'yes') {
-				try {
-					$this->mailHelper->sendMail(
-						$user,
-						$this->mailHelper->generateTemplate($user, true)
-					);
-					$output->writeln('Invitation E-Mail sent.');
-				} catch (\Exception $e) {
-					$output->writeln(\sprintf('Unable to send the invitation mail to %s', $user->getEMailAddress()));
-				}
-			}
-		}
-
 		$groups = $input->getOption('group');
 
 		if (!empty($groups)) {
@@ -257,18 +194,22 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 				$output->writeln('User "' . $user->getUID() . '" added to group "' . $group->getGID() . '"');
 			}
 		}
-		return 0;
-	}
 
-	/**
-	 * @return string
-	 */
-	protected function getTemporaryPassword(): string
-	{
-		$passwordEvent = new GenerateSecurePasswordEvent();
+		// Send email to user if we set a temporary password
+		if ($sendPasswordEmail) {
+			$email = $input->getOption('email');
+			$user->setSystemEMailAddress($email);
 
-		$this->eventDispatcher->dispatchTyped($passwordEvent);
+			if ($this->config->getAppValue('core', 'newUser.sendEmail', 'yes') === 'yes') {
+				try {
+					$this->mailHelper->sendMail($user, $this->mailHelper->generateTemplate($user, true));
+					$output->writeln(\sprintf('Invitation E-Mail sent to %s.', $email));
+				} catch (\Exception $e) {
+					$output->writeln(\sprintf('Unable to send the invitation mail to %s', $email));
+				}
+			}
+		}
 
-		return $passwordEvent->getPassword() ?? $this->secureRandom->generate(20);
+		return 0;
 	}
 }
diff --git a/tests/Core/Command/User/AddTest.php b/tests/Core/Command/User/AddTest.php
index 1445e3cfec6b2..4e6305153fc19 100644
--- a/tests/Core/Command/User/AddTest.php
+++ b/tests/Core/Command/User/AddTest.php
@@ -40,7 +40,6 @@
 use Test\TestCase;
 
 class AddTest extends TestCase {
-
 	/**
 	 * @dataProvider addEmailDataProvider
 	 */