diff --git a/lib/AppInfo/Application.php b/lib/AppInfo/Application.php
index c2066cfe0..1e76210bf 100644
--- a/lib/AppInfo/Application.php
+++ b/lib/AppInfo/Application.php
@@ -59,8 +59,8 @@ public function register(IRegistrationContext $context): void {
 
 		$context->registerEventListener(UserDeletedEvent::class, UserDeletedListener::class);
 		$context->registerEventListener(BeforeTemplateRenderedEvent::class, BeforeTemplateRenderedListener::class);
-        $context->registerEventListener(UserCreatedEvent::class, UserCreatedListener::class);
-        $context->registerEventListener(PostLoginEvent::class, PostLoginListener::class);
+		$context->registerEventListener(UserCreatedEvent::class, UserCreatedListener::class);
+		$context->registerEventListener(PostLoginEvent::class, PostLoginListener::class);
 	}
 
 	public function boot(IBootContext $context): void {
diff --git a/lib/Controller/SettingsController.php b/lib/Controller/SettingsController.php
index dae6e100a..1b29a4a5f 100644
--- a/lib/Controller/SettingsController.php
+++ b/lib/Controller/SettingsController.php
@@ -60,7 +60,6 @@ public function personal(int $batchSetting, string $soundNotification, string $s
 	}
 
     /**
-     * @PasswordConfirmationRequired
      * @AuthorizedAdminSetting(settings=OCA\Notifications\Settings\Admin)
      */
     public function admin(int $batchSetting, string $soundNotification, string $soundTalk): DataResponse {
diff --git a/lib/Listener/PostLoginListener.php b/lib/Listener/PostLoginListener.php
index caa9938d0..dd16ae2d8 100644
--- a/lib/Listener/PostLoginListener.php
+++ b/lib/Listener/PostLoginListener.php
@@ -59,11 +59,11 @@ public function handle(Event $event): void {
         $default_sound_talk = $this->config->getAppValue(Application::APP_ID, 'sound_talk') === 'yes' ? 'yes' : 'no';
         $default_batchtime = $this->config->getAppValue(Application::APP_ID, 'setting_batchtime');
 
-        if ($default_batchtime != Settings::EMAIL_SEND_WEEKLY
-            && $default_batchtime != Settings::EMAIL_SEND_DAILY
-            && $default_batchtime != Settings::EMAIL_SEND_3HOURLY
-            && $default_batchtime != Settings::EMAIL_SEND_HOURLY
-            && $default_batchtime != Settings::EMAIL_SEND_OFF) {
+        if ($default_batchtime !== Settings::EMAIL_SEND_WEEKLY
+            && $default_batchtime !== Settings::EMAIL_SEND_DAILY
+            && $default_batchtime !== Settings::EMAIL_SEND_3HOURLY
+            && $default_batchtime !== Settings::EMAIL_SEND_HOURLY
+            && $default_batchtime !== Settings::EMAIL_SEND_OFF) {
             $default_batchtime = Settings::EMAIL_SEND_3HOURLY;
         }
 
diff --git a/lib/Listener/UserCreatedListener.php b/lib/Listener/UserCreatedListener.php
index 7c713c7a1..51b9c22ae 100644
--- a/lib/Listener/UserCreatedListener.php
+++ b/lib/Listener/UserCreatedListener.php
@@ -57,11 +57,11 @@ public function handle(Event $event): void {
         $default_sound_talk = $this->config->getAppValue(Application::APP_ID, 'sound_talk') === 'yes' ? 'yes' : 'no';
         $default_batchtime = $this->config->getAppValue(Application::APP_ID, 'setting_batchtime');
 
-        if ($default_batchtime != Settings::EMAIL_SEND_WEEKLY
-            && $default_batchtime != Settings::EMAIL_SEND_DAILY
-            && $default_batchtime != Settings::EMAIL_SEND_3HOURLY
-            && $default_batchtime != Settings::EMAIL_SEND_HOURLY
-            && $default_batchtime != Settings::EMAIL_SEND_OFF) {
+        if ($default_batchtime !== Settings::EMAIL_SEND_WEEKLY
+            && $default_batchtime !== Settings::EMAIL_SEND_DAILY
+            && $default_batchtime !== Settings::EMAIL_SEND_3HOURLY
+            && $default_batchtime !== Settings::EMAIL_SEND_HOURLY
+            && $default_batchtime !== Settings::EMAIL_SEND_OFF) {
             $default_batchtime = Settings::EMAIL_SEND_3HOURLY;
         }