diff --git a/common/utils/eveai_exceptions.py b/common/utils/eveai_exceptions.py
index f12f66c..d76c0db 100644
--- a/common/utils/eveai_exceptions.py
+++ b/common/utils/eveai_exceptions.py
@@ -92,6 +92,13 @@ class EveAINoActiveLicense(EveAIException):
         super().__init__(message, status_code, payload)
 
 
+class EveAIUserExpired(EveAIException):
+    """Raised when a user account is no longer valid (valid_to expired)"""
+
+    def __init__(self, message="Your account has expired", status_code=401, payload=None):
+        super().__init__(message, status_code, payload)
+
+
 class EveAIInvalidCatalog(EveAIException):
     """Raised when a catalog cannot be found"""
 
diff --git a/common/utils/security.py b/common/utils/security.py
index 7b24793..8752d2d 100644
--- a/common/utils/security.py
+++ b/common/utils/security.py
@@ -35,13 +35,14 @@ def is_valid_tenant(tenant_id):
     if tenant_id == 1:  # The 'root' tenant, is always valid
         return True
     tenant = Tenant.query.get(tenant_id)
-    Database(tenant).switch_schema()
+
     if tenant is None:
         raise EveAITenantNotFound()
     elif tenant.type == 'Inactive':
         raise EveAITenantInvalid(tenant_id)
     else:
         current_date = dt.now(tz=tz.utc).date()
+        Database(str(tenant_id)).switch_schema()
         # TODO -> Check vervangen door Active License Period!
         # active_license = (License.query.filter_by(tenant_id=tenant_id)
         #                   .filter(and_(License.start_date <= current_date,
diff --git a/eveai_app/views/security_views.py b/eveai_app/views/security_views.py
index 598666e..f9d25f0 100644
--- a/eveai_app/views/security_views.py
+++ b/eveai_app/views/security_views.py
@@ -12,7 +12,7 @@ from sqlalchemy.exc import SQLAlchemyError
 
 from common.models.user import User, ConsentStatus
 from common.services.user import TenantServices, UserServices
-from common.utils.eveai_exceptions import EveAIException, EveAINoActiveLicense
+from common.utils.eveai_exceptions import EveAIException, EveAINoActiveLicense, EveAIUserExpired
 from common.utils.nginx_utils import prefixed_url_for
 from eveai_app.views.security_forms import SetPasswordForm, ResetPasswordForm, ForgotPasswordForm
 from common.extensions import db
@@ -46,6 +46,14 @@ def login():
                     user = User.query.filter_by(email=form.email.data).first()
                     if user is None or not verify_and_update_password(form.password.data, user):
                         raise EveAIException('Invalid email or password')
+                    # Check if the user's account is still valid based on valid_to
+                    today = dt.now(tz=tz.utc).date()
+                    if user.valid_to is not None and today > user.valid_to:
+                        current_app.logger.warning(
+                            f"Login blocked for expired user {user.id} ({user.email}); "
+                            f"today={today}, valid_to={user.valid_to}"
+                        )
+                        raise EveAIUserExpired()
                     is_valid_tenant(user.tenant_id)
                 except EveAIException as e:
                     flash(f'Failed to login user: {str(e)}', 'danger')