diff --git a/src/main/java/com/agendaestudantil/filtro/FiltroJwt.java b/src/main/java/com/agendaestudantil/filtro/FiltroJwt.java
index 4d4e9d0..987ba5e 100644
--- a/src/main/java/com/agendaestudantil/filtro/FiltroJwt.java
+++ b/src/main/java/com/agendaestudantil/filtro/FiltroJwt.java
@@ -5,6 +5,8 @@ import jakarta.servlet.FilterChain;
 import jakarta.servlet.ServletException;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
 import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.security.core.userdetails.UserDetails;
@@ -17,6 +19,8 @@ import java.io.IOException;
 @Component
 public class FiltroJwt extends OncePerRequestFilter {
 
+    private static final Logger log = LoggerFactory.getLogger(FiltroJwt.class);
+
     private final UtilJwt utilJwt;
     private final UserDetailsService userDetailsService;
 
@@ -30,8 +34,11 @@ public class FiltroJwt extends OncePerRequestFilter {
         String path = request.getRequestURI();
         return path.equals("/") || path.equals("/index.html") || path.equals("/favicon.ico")
                 || path.startsWith("/static/") || path.startsWith("/css/") || path.startsWith("/js/") 
-                || path.startsWith("/img/") || path.endsWith(".css") || path.endsWith(".js") 
-                || path.endsWith(".ico") || path.endsWith(".html");
+                || path.startsWith("/img/") || path.startsWith("/imagens/")
+                || path.startsWith("/api/estudantes/login") || path.startsWith("/api/estudantes/cadastro")
+                || path.endsWith(".css") || path.endsWith(".js") 
+                || path.endsWith(".ico") || path.endsWith(".html") || path.endsWith(".png")
+                || path.endsWith(".svg");
     }
 
     @Override
@@ -44,16 +51,21 @@ public class FiltroJwt extends OncePerRequestFilter {
 
         if (header != null && header.startsWith("Bearer ")) {
             token = header.substring(7);
-            estudanteId = utilJwt.getEstudanteIdFromToken(token);
         }
 
-        if (estudanteId != null && SecurityContextHolder.getContext().getAuthentication() == null) {
-            UserDetails userDetails = userDetailsService.loadUserByUsername(estudanteId);
+        if (token != null && utilJwt.validateToken(token)) {
+            estudanteId = utilJwt.getEstudanteIdFromToken(token);
 
-            if (utilJwt.validateToken(token)) {
-                UsernamePasswordAuthenticationToken authentication = new UsernamePasswordAuthenticationToken(
-                        userDetails, null, userDetails.getAuthorities());
-                SecurityContextHolder.getContext().setAuthentication(authentication);
+            if (SecurityContextHolder.getContext().getAuthentication() == null) {
+                try {
+                    UserDetails userDetails = userDetailsService.loadUserByUsername(estudanteId);
+                    UsernamePasswordAuthenticationToken authentication = new UsernamePasswordAuthenticationToken(
+                            userDetails, null, userDetails.getAuthorities());
+                    SecurityContextHolder.getContext().setAuthentication(authentication);
+                } catch (Exception e) {
+                    log.warn("Falha ao carregar usuario do token (id={}): {}", estudanteId, e.getMessage());
+                    SecurityContextHolder.clearContext();
+                }
             }
         }
 
diff --git a/src/main/resources/static/login.html b/src/main/resources/static/login.html
index a7e60ca..918d478 100644
--- a/src/main/resources/static/login.html
+++ b/src/main/resources/static/login.html
@@ -7,15 +7,17 @@
     <link rel="stylesheet" href="login.css">
     <link href="https://fonts.googleapis.com/css2?family=Poppins:wght@400;500;600;700&display=swap" rel="stylesheet">
     <title>Login – Focus Agenda</title>
+    <script src="theme.js"></script>
 </head>
 <body>
     <div id="topo">
         <h1 id="textotop">Focus Agenda</h1>
+        <button class="theme-toggle-btn" onclick="toggleTheme()" title="Tema Escuro"><img src="imagens/moon-svgrepo-com.svg" class="theme-icon" alt="Tema"></button>
     </div>
 
     <div id="log">
         <h1 class="mens">Bem-vindo!</h1>
-        <h3 class="mens">Faça seu login</h3>
+        <h3 class="mens">Faca seu login</h3>
 
         <div id="mensagem-erro" role="alert"></div>
 
@@ -35,10 +37,35 @@
     </div>
 
     <script>
-        // Se já tiver token válido, redireciona direto
         (function () {
-            if (localStorage.getItem('fa_token')) {
-                window.location.href = 'calendario.html';
+            const params = new URLSearchParams(window.location.search);
+            if (params.get('sessao') === 'expirada') {
+                localStorage.removeItem('fa_token');
+                localStorage.removeItem('fa_user');
+                const erroEl = document.getElementById('mensagem-erro');
+                erroEl.textContent = 'Sua sessao expirou. Faca login novamente.';
+                erroEl.style.display = 'block';
+                return;
+            }
+
+            const token = localStorage.getItem('fa_token');
+            if (token && token.split('.').length === 3) {
+                try {
+                    const payload = JSON.parse(atob(token.split('.')[1]));
+                    if (payload.exp && Date.now() >= payload.exp * 1000) {
+                        localStorage.removeItem('fa_token');
+                        localStorage.removeItem('fa_user');
+                    } else {
+                        window.location.href = 'calendario.html';
+                        return;
+                    }
+                } catch {
+                    localStorage.removeItem('fa_token');
+                    localStorage.removeItem('fa_user');
+                }
+            } else if (token) {
+                localStorage.removeItem('fa_token');
+                localStorage.removeItem('fa_user');
             }
         })();
 
@@ -80,13 +107,12 @@
                     return;
                 }
 
-                // Salva token e dados do usuário
                 localStorage.setItem('fa_token', json.data.token);
                 localStorage.setItem('fa_user', JSON.stringify(json.data.estudante));
 
                 window.location.href = 'calendario.html';
             } catch (err) {
-                mostrarErro('Erro de conexão. Verifique se o servidor está rodando.');
+                mostrarErro('Erro de conexao. Verifique se o servidor esta rodando.');
             } finally {
                 btn.disabled = false;
                 btn.textContent = 'Entrar';
