Merge branch 'master' into nmc/customizations

COPYING

@@ -1,10 +1,11 @@
-Although the code for this Magentacloud custom web theme for Nextcloud is free and available under the GPL 3 license below, Deutsche Telekom (including T-Systems)  fully reserves all rights to the Telekom brand. To prevent users from getting confused about
+Although the code for this Magentacloud custom web theme for Nextcloud is free and available under the GPL 3 license below, 
+Deutsche Telekom (including T-Systems) fully reserves all rights to the Telekom brand. To prevent users from getting confused about
 the source of a digital product or experience, there are stringent restrictions on using the Telekom brand and design,
 even when built into code that we provide. For any customization other than explicitly for Telekom or T-Systems, you must
 replace the Deutsche Telekom and T-Systems brand elements contained in the provided sources.
 
-                GNU AFFERO GENERAL PUBLIC LICENSE
-                    Version 3, 19 November 2007
+                    GNU AFFERO GENERAL PUBLIC LICENSE
+                       Version 3, 19 November 2007
 
  Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
  Everyone is permitted to copy and distribute verbatim copies
@@ -663,4 +664,4 @@ specific requirements.
   You should also get your employer (if you work as a programmer) or school,
 if any, to sign a "copyright disclaimer" for the program, if necessary.
 For more information on this, and how to apply and follow the GNU AGPL, see
-<http://www.gnu.org/licenses/>.
+<http://www.gnu.org/licenses/>.

lib/Service/MailSender.php

@@ -178,15 +178,17 @@ private function handleStorage(IEMailTemplate $emailTemplate, IUser $user): bool
 	public function sendMonthlyMailTo(NotificationTracker $trackedNotification): bool {
 		$message = $this->mailer->createMessage();
 		$user = $this->userManager->get($trackedNotification->getUserId());
+
 		if ($user === null) {
 			$this->service->delete($trackedNotification);
 			return false;
 		}
+
 		if ($user->getLastLogin() === 0) {
 			$this->service->delete($trackedNotification);
 			return false;
 		}
-
+		
 		$emailTemplate = $this->setUpMail($message, $trackedNotification, $user);
 		if ($emailTemplate === null) {
 			return false;