diff --git a/go.mod b/go.mod
index cc180fc..bb93991 100644
--- a/go.mod
+++ b/go.mod
@@ -10,7 +10,7 @@ require (
 	github.com/golang-jwt/jwt v3.2.2+incompatible
 	github.com/google/uuid v1.4.0
 	github.com/jackc/pgx/v5 v5.4.3
-	github.com/labstack/echo/v4 v4.11.3
+	github.com/labstack/echo/v4 v4.13.4
 	golang.org/x/crypto v0.46.0
 )
 
@@ -18,12 +18,14 @@ require (
 	github.com/gabriel-vasile/mimetype v1.4.12 // indirect
 	github.com/go-playground/locales v0.14.1 // indirect
 	github.com/go-playground/universal-translator v0.18.1 // indirect
+	github.com/golang-jwt/jwt/v5 v5.3.0 // indirect
 	github.com/jackc/pgpassfile v1.0.0 // indirect
 	github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a // indirect
 	github.com/jackc/puddle/v2 v2.2.1 // indirect
-	github.com/labstack/gommon v0.4.0 // indirect
+	github.com/labstack/echo-jwt/v4 v4.4.0 // indirect
+	github.com/labstack/gommon v0.4.2 // indirect
 	github.com/leodido/go-urn v1.4.0 // indirect
-	github.com/mattn/go-colorable v0.1.13 // indirect
+	github.com/mattn/go-colorable v0.1.14 // indirect
 	github.com/mattn/go-isatty v0.0.20 // indirect
 	github.com/valyala/bytebufferpool v1.0.0 // indirect
 	github.com/valyala/fasttemplate v1.2.2 // indirect
@@ -31,5 +33,5 @@ require (
 	golang.org/x/sync v0.19.0 // indirect
 	golang.org/x/sys v0.39.0 // indirect
 	golang.org/x/text v0.32.0 // indirect
-	golang.org/x/time v0.3.0 // indirect
+	golang.org/x/time v0.14.0 // indirect
 )
diff --git a/go.sum b/go.sum
index b342b1b..5205f59 100644
--- a/go.sum
+++ b/go.sum
@@ -19,6 +19,8 @@ github.com/go-playground/validator/v10 v10.30.1 h1:f3zDSN/zOma+w6+1Wswgd9fLkdwy0
 github.com/go-playground/validator/v10 v10.30.1/go.mod h1:oSuBIQzuJxL//3MelwSLD5hc2Tu889bF0Idm9Dg26cM=
 github.com/golang-jwt/jwt v3.2.2+incompatible h1:IfV12K8xAKAnZqdXVzCZ+TOjboZ2keLg81eXfW3O+oY=
 github.com/golang-jwt/jwt v3.2.2+incompatible/go.mod h1:8pz2t5EyA70fFQQSrl6XZXzqecmYZeUEB8OUGHkxJ+I=
+github.com/golang-jwt/jwt/v5 v5.3.0 h1:pv4AsKCKKZuqlgs5sUmn4x8UlGa0kEVt/puTpKx9vvo=
+github.com/golang-jwt/jwt/v5 v5.3.0/go.mod h1:fxCRLWMO43lRc8nhHWY6LGqRcf+1gQWArsqaEUEa5bE=
 github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
 github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/uuid v1.4.0 h1:MtMxsa51/r9yyhkyLsVeVt0B+BGQZzpQiTQ4eHZ8bc4=
@@ -31,15 +33,23 @@ github.com/jackc/pgx/v5 v5.4.3 h1:cxFyXhxlvAifxnkKKdlxv8XqUf59tDlYjnV5YYfsJJY=
 github.com/jackc/pgx/v5 v5.4.3/go.mod h1:Ig06C2Vu0t5qXC60W8sqIthScaEnFvojjj9dSljmHRA=
 github.com/jackc/puddle/v2 v2.2.1 h1:RhxXJtFG022u4ibrCSMSiu5aOq1i77R3OHKNJj77OAk=
 github.com/jackc/puddle/v2 v2.2.1/go.mod h1:vriiEXHvEE654aYKXXjOvZM39qJ0q+azkZFrfEOc3H4=
+github.com/labstack/echo-jwt/v4 v4.4.0 h1:nrXaEnJupfc2R4XChcLRDyghhMZup77F8nIzHnBK19U=
+github.com/labstack/echo-jwt/v4 v4.4.0/go.mod h1:kYXWgWms9iFqI3ldR+HAEj/Zfg5rZtR7ePOgktG4Hjg=
 github.com/labstack/echo/v4 v4.11.3 h1:Upyu3olaqSHkCjs1EJJwQ3WId8b8b1hxbogyommKktM=
 github.com/labstack/echo/v4 v4.11.3/go.mod h1:UcGuQ8V6ZNRmSweBIJkPvGfwCMIlFmiqrPqiEBfPYws=
+github.com/labstack/echo/v4 v4.13.4 h1:oTZZW+T3s9gAu5L8vmzihV7/lkXGZuITzTQkTEhcXEA=
+github.com/labstack/echo/v4 v4.13.4/go.mod h1:g63b33BZ5vZzcIUF8AtRH40DrTlXnx4UMC8rBdndmjQ=
 github.com/labstack/gommon v0.4.0 h1:y7cvthEAEbU0yHOf4axH8ZG2NH8knB9iNSoTO8dyIk8=
 github.com/labstack/gommon v0.4.0/go.mod h1:uW6kP17uPlLJsD3ijUYn3/M5bAxtlZhMI6m3MFxTMTM=
+github.com/labstack/gommon v0.4.2 h1:F8qTUNXgG1+6WQmqoUWnz8WiEU60mXVVw0P4ht1WRA0=
+github.com/labstack/gommon v0.4.2/go.mod h1:QlUFxVM+SNXhDL/Z7YhocGIBYOiwB0mXm1+1bAPHPyU=
 github.com/leodido/go-urn v1.4.0 h1:WT9HwE9SGECu3lg4d/dIA+jxlljEa1/ffXKmRjqdmIQ=
 github.com/leodido/go-urn v1.4.0/go.mod h1:bvxc+MVxLKB4z00jd1z+Dvzr47oO32F/QSNjSBOlFxI=
 github.com/mattn/go-colorable v0.1.11/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4=
 github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA=
 github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg=
+github.com/mattn/go-colorable v0.1.14 h1:9A9LHSqF/7dyVVX6g0U9cwm9pG3kP9gSzcuIPHPsaIE=
+github.com/mattn/go-colorable v0.1.14/go.mod h1:6LmQG8QLFO4G5z1gPvYEzlUgJ2wF+stgPZH1UqBm1s8=
 github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94=
 github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
 github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
@@ -51,6 +61,7 @@ github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UV
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
 github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
+github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=
 github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw=
 github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc=
 github.com/valyala/fasttemplate v1.2.1/go.mod h1:KHLXt3tVN2HBp8eijSv/kGJopbvo7S+qRAEEKiv+SiQ=
@@ -73,6 +84,8 @@ golang.org/x/text v0.32.0 h1:ZD01bjUt1FQ9WJ0ClOL5vxgxOI/sVCNgX1YtKwcY0mU=
 golang.org/x/text v0.32.0/go.mod h1:o/rUWzghvpD5TXrTIBuJU77MTaN0ljMWE47kxGJQ7jY=
 golang.org/x/time v0.3.0 h1:rg5rLMjNzMS1RkNLzCG38eapWhnYLFYXDXj2gOlr8j4=
 golang.org/x/time v0.3.0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
+golang.org/x/time v0.14.0 h1:MRx4UaLrDotUKUdCIqzPC48t1Y9hANFKIRpNx+Te8PI=
+golang.org/x/time v0.14.0/go.mod h1:eL/Oa2bBBK0TkX57Fyni+NgnyQQN4LitPmob2Hjnqw4=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
diff --git a/templates/admin.templ b/templates/admin.templ
index beec66c..cf76a2f 100644
--- a/templates/admin.templ
+++ b/templates/admin.templ
@@ -1,6 +1,6 @@
 package templates
 
-templ Admin(user User, currentPage string) {
+templ Admin(user User) {
     <!DOCTYPE html>
     <html lang="en">
     <head>
@@ -82,61 +82,59 @@ templ Admin(user User, currentPage string) {
 
             <main class="flex-1 p-8">
                 <div class="max-w-4xl">
-                    if currentPage == "dashboard" {
-                        <div class="mb-8">
-                            <h1 class="text-3xl font-bold mb-2" style="color: var(--text-primary)">Dashboard</h1>
-                            <p style="color: var(--text-secondary)">Overview of your Bookmann library and settings</p>
-                        </div>
+                    <div class="mb-8">
+                        <h1 class="text-3xl font-bold mb-2" style="color: var(--text-primary)">Dashboard</h1>
+                        <p style="color: var(--text-secondary)">Overview of your Bookmann library and settings</p>
+                    </div>
 
-                        <div class="grid grid-cols-1 md:grid-cols-3 gap-6 mb-8">
-                            <div class="card p-6 rounded-lg border" style="background-color: var(--bg-secondary); border-color: var(--border)">
-                                <div class="flex items-center space-x-3">
-                                    <div class="text-3xl">📖</div>
-                                    <div>
-                                        <h3 class="font-semibold" style="color: var(--text-primary)">Library</h3>
-                                        <p style="color: var(--text-secondary)" class="text-sm">Manage your ebook collection</p>
-                                    </div>
+                    <div class="grid grid-cols-1 md:grid-cols-3 gap-6 mb-8">
+                        <div class="card p-6 rounded-lg border" style="background-color: var(--bg-secondary); border-color: var(--border)">
+                            <div class="flex items-center space-x-3">
+                                <div class="text-3xl">📖</div>
+                                <div>
+                                    <h3 class="font-semibold" style="color: var(--text-primary)">Library</h3>
+                                    <p style="color: var(--text-secondary)" class="text-sm">Manage your ebook collection</p>
                                 </div>
-                                <a href="/" class="mt-4 inline-block text-sm btn-secondary px-3 py-1 rounded">View Library</a>
-                            </div>
-
-                            <div class="card p-6 rounded-lg border" style="background-color: var(--bg-secondary); border-color: var(--border)">
-                                <div class="flex items-center space-x-3">
-                                    <div class="text-3xl">⚙️</div>
-                                    <div>
-                                        <h3 class="font-semibold" style="color: var(--text-primary)">Settings</h3>
-                                        <p style="color: var(--text-secondary)" class="text-sm">Configure your preferences</p>
-                                    </div>
-                                </div>
-                                <a href="/admin/profile" class="mt-4 inline-block text-sm btn-secondary px-3 py-1 rounded">Manage Settings</a>
-                            </div>
-
-                            <div class="card p-6 rounded-lg border" style="background-color: var(--bg-secondary); border-color: var(--border)">
-                                <div class="flex items-center space-x-3">
-                                    <div class="text-3xl">🔍</div>
-                                    <div>
-                                        <h3 class="font-semibold" style="color: var(--text-primary)">Scanner</h3>
-                                        <p style="color: var(--text-secondary)" class="text-sm">Library scanning options</p>
-                                    </div>
-                                </div>
-                                <a href="/admin/scanner" class="mt-4 inline-block text-sm btn-secondary px-3 py-1 rounded">Configure Scanner</a>
                             </div>
+                            <a href="/" class="mt-4 inline-block text-sm btn-secondary px-3 py-1 rounded">View Library</a>
                         </div>
 
                         <div class="card p-6 rounded-lg border" style="background-color: var(--bg-secondary); border-color: var(--border)">
-                            <h3 class="text-xl font-semibold mb-4" style="color: var(--text-primary)">Quick Actions</h3>
-                            <div class="grid grid-cols-1 sm:grid-cols-2 gap-4">
-                                <button onclick="quickScan()" class="btn-primary p-4 rounded-lg text-left">
-                                    <div class="font-medium">Scan Library</div>
-                                    <div style="color: var(--text-secondary)" class="text-sm">Find new ebooks in your folders</div>
-                                </button>
-                                <a href="/admin/library" class="btn-secondary p-4 rounded-lg text-left block">
-                                    <div class="font-medium">Manage Folders</div>
-                                    <div style="color: var(--text-secondary)" class="text-sm">Add or remove scan directories</div>
-                                </a>
+                            <div class="flex items-center space-x-3">
+                                <div class="text-3xl">⚙️</div>
+                                <div>
+                                    <h3 class="font-semibold" style="color: var(--text-primary)">Settings</h3>
+                                    <p style="color: var(--text-secondary)" class="text-sm">Configure your preferences</p>
+                                </div>
                             </div>
+                            <a href="/admin/profile" class="mt-4 inline-block text-sm btn-secondary px-3 py-1 rounded">Manage Settings</a>
                         </div>
-                    }
+
+                        <div class="card p-6 rounded-lg border" style="background-color: var(--bg-secondary); border-color: var(--border)">
+                            <div class="flex items-center space-x-3">
+                                <div class="text-3xl">🔍</div>
+                                <div>
+                                    <h3 class="font-semibold" style="color: var(--text-primary)">Scanner</h3>
+                                    <p style="color: var(--text-secondary)" class="text-sm">Library scanning options</p>
+                                </div>
+                            </div>
+                            <a href="/admin/scanner" class="mt-4 inline-block text-sm btn-secondary px-3 py-1 rounded">Configure Scanner</a>
+                        </div>
+                    </div>
+
+                    <div class="card p-6 rounded-lg border" style="background-color: var(--bg-secondary); border-color: var(--border)">
+                        <h3 class="text-xl font-semibold mb-4" style="color: var(--text-primary)">Quick Actions</h3>
+                        <div class="grid grid-cols-1 sm:grid-cols-2 gap-4">
+                            <button onclick="quickScan()" class="btn-primary p-4 rounded-lg text-left">
+                                <div class="font-medium">Scan Library</div>
+                                <div style="color: var(--text-secondary)" class="text-sm">Find new ebooks in your folders</div>
+                            </button>
+                            <a href="/admin/library" class="btn-secondary p-4 rounded-lg text-left block">
+                                <div class="font-medium">Manage Folders</div>
+                                <div style="color: var(--text-secondary)" class="text-sm">Add or remove scan directories</div>
+                            </a>
+                        </div>
+                    </div>
                 </div>
             </main>
         </div>