diff --git a/src/Security/EnsureSAMLUserForSAMLLoginChecker.php b/src/Security/EnsureSAMLUserForSAMLLoginChecker.php
new file mode 100644
index 00000000..a65e6146
--- /dev/null
+++ b/src/Security/EnsureSAMLUserForSAMLLoginChecker.php
@@ -0,0 +1,63 @@
+<?php
+/*
+ * This file is part of Part-DB (https://github.com/Part-DB/Part-DB-symfony).
+ *
+ *  Copyright (C) 2019 - 2023 Jan Böhmer (https://github.com/jbtronics)
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU Affero General Public License as published
+ *  by the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+namespace App\Security;
+
+use App\Entity\UserSystem\User;
+use Hslavich\OneloginSamlBundle\Security\Http\Authenticator\Token\SamlToken;
+use Symfony\Component\EventDispatcher\EventSubscriberInterface;
+use Symfony\Component\Security\Core\Event\AuthenticationSuccessEvent;
+use Symfony\Component\Security\Core\Exception\AuthenticationException;
+use Symfony\Component\Security\Core\Exception\CustomUserMessageAccountStatusException;
+use Symfony\Contracts\Translation\TranslatorInterface;
+
+class EnsureSAMLUserForSAMLLoginChecker implements EventSubscriberInterface
+{
+    private TranslatorInterface $translator;
+
+    public function __construct(TranslatorInterface $translator)
+    {
+        $this->translator = $translator;
+    }
+
+    public static function getSubscribedEvents()
+    {
+        return [
+            AuthenticationSuccessEvent::class => 'onAuthenticationSuccess',
+        ];
+    }
+
+    public function onAuthenticationSuccess(AuthenticationSuccessEvent $event)
+    {
+        $token = $event->getAuthenticationToken();
+        $user = $token->getUser();
+
+        //If we are using SAML, we need to check that the user is a SAML user.
+        if ($token instanceof SamlToken) {
+            if ($user instanceof User && !$user->isSAMLUser()) {
+                throw new CustomUserMessageAccountStatusException($this->translator->trans('saml.error.cannot_login_local_user_per_saml', [], 'security'));
+            }
+        } else { //Ensure that you can not login locally with a SAML user (even if this should not happen, as the password is not set)
+            if ($user instanceof User && $user->isSamlUser()) {
+                throw new CustomUserMessageAccountStatusException($this->translator->trans('saml.error.cannot_login_saml_user_locally', [], 'security'));
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Security/UserChecker.php b/src/Security/UserChecker.php
index d42d3390..ae8e3f34 100644
--- a/src/Security/UserChecker.php
+++ b/src/Security/UserChecker.php
@@ -63,7 +63,7 @@ final class UserChecker implements UserCheckerInterface
         //Check if user is disabled. Then dont allow login
         if ($user->isDisabled()) {
             //throw new DisabledException();
-            throw new CustomUserMessageAccountStatusException($this->translator->trans('user.login_error.user_disabled'));
+            throw new CustomUserMessageAccountStatusException($this->translator->trans('user.login_error.user_disabled', [], 'security'));
         }
     }
 }
diff --git a/translations/security.en.xlf b/translations/security.en.xlf
index 8c76136f..2c9d8957 100644
--- a/translations/security.en.xlf
+++ b/translations/security.en.xlf
@@ -7,5 +7,11 @@
         <target>Your account is disabled! Contact an administrator if you think this is wrong.</target>
       </segment>
     </unit>
+    <unit id="Dpb9AmY" name="saml.error.cannot_login_local_user_per_saml">
+      <segment>
+        <source>saml.error.cannot_login_local_user_per_saml</source>
+        <target>You can not login as local user via SSO! Use your local user password instead.</target>
+      </segment>
+    </unit>
   </file>
 </xliff>