diff --git a/package-lock.json b/package-lock.json
index 0447f674..e6ebd921 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -566,6 +566,7 @@
       "cpu": [
         "ppc64"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -582,6 +583,7 @@
       "cpu": [
         "arm"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -598,6 +600,7 @@
       "cpu": [
         "arm64"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -614,6 +617,7 @@
       "cpu": [
         "x64"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -630,6 +634,7 @@
       "cpu": [
         "arm64"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -646,6 +651,7 @@
       "cpu": [
         "x64"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -662,6 +668,7 @@
       "cpu": [
         "arm64"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -678,6 +685,7 @@
       "cpu": [
         "x64"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -694,6 +702,7 @@
       "cpu": [
         "arm"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -710,6 +719,7 @@
       "cpu": [
         "arm64"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -726,6 +736,7 @@
       "cpu": [
         "ia32"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -742,6 +753,7 @@
       "cpu": [
         "loong64"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -758,6 +770,7 @@
       "cpu": [
         "mips64el"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -774,6 +787,7 @@
       "cpu": [
         "ppc64"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -790,6 +804,7 @@
       "cpu": [
         "riscv64"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -806,6 +821,7 @@
       "cpu": [
         "s390x"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -822,6 +838,7 @@
       "cpu": [
         "x64"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -838,6 +855,7 @@
       "cpu": [
         "arm64"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -854,6 +872,7 @@
       "cpu": [
         "x64"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -870,6 +889,7 @@
       "cpu": [
         "arm64"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -886,6 +906,7 @@
       "cpu": [
         "x64"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -902,6 +923,7 @@
       "cpu": [
         "arm64"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -918,6 +940,7 @@
       "cpu": [
         "x64"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -934,6 +957,7 @@
       "cpu": [
         "arm64"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -950,6 +974,7 @@
       "cpu": [
         "ia32"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -966,6 +991,7 @@
       "cpu": [
         "x64"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -2834,6 +2860,7 @@
       "cpu": [
         "arm"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -2847,6 +2874,7 @@
       "cpu": [
         "arm64"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -2860,6 +2888,7 @@
       "cpu": [
         "arm64"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -2873,6 +2902,7 @@
       "cpu": [
         "x64"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -2886,6 +2916,7 @@
       "cpu": [
         "arm64"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -2899,6 +2930,7 @@
       "cpu": [
         "x64"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -2912,6 +2944,7 @@
       "cpu": [
         "arm"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -2925,6 +2958,7 @@
       "cpu": [
         "arm"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -2938,6 +2972,7 @@
       "cpu": [
         "arm64"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -2951,6 +2986,7 @@
       "cpu": [
         "arm64"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -2964,6 +3000,7 @@
       "cpu": [
         "loong64"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -2977,6 +3014,7 @@
       "cpu": [
         "ppc64"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -2990,6 +3028,7 @@
       "cpu": [
         "riscv64"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -3003,6 +3042,7 @@
       "cpu": [
         "riscv64"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -3016,6 +3056,7 @@
       "cpu": [
         "s390x"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -3029,6 +3070,7 @@
       "cpu": [
         "x64"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -3042,6 +3084,7 @@
       "cpu": [
         "x64"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -3055,6 +3098,7 @@
       "cpu": [
         "arm64"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -3068,6 +3112,7 @@
       "cpu": [
         "ia32"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -3081,6 +3126,7 @@
       "cpu": [
         "x64"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -3673,7 +3719,7 @@
       "version": "7.6.13",
       "resolved": "https://registry.npmjs.org/@types/better-sqlite3/-/better-sqlite3-7.6.13.tgz",
       "integrity": "sha512-NMv9ASNARoKksWtsq/SHakpYAYnhBrQgGD8zkLYk/jaK8jUGn08CfEdTRgYhMypUQAfzSP8W6gNLe0q19/t4VA==",
-      "devOptional": true,
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@types/node": "*"
@@ -3712,6 +3758,7 @@
       "version": "1.0.8",
       "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.8.tgz",
       "integrity": "sha512-dWHzHa2WqEXI/O1E9OjrocMTKJl2mSrEolh1Iomrv6U+JuNwaHXsXx9bLu5gG7BUWFIN0skIQJQ/L1rIex4X6w==",
+      "dev": true,
       "license": "MIT"
     },
     "node_modules/@types/express": {
@@ -3817,7 +3864,7 @@
       "version": "19.1.8",
       "resolved": "https://registry.npmjs.org/@types/react/-/react-19.1.8.tgz",
       "integrity": "sha512-AwAfQ2Wa5bCx9WP8nZL2uMZWod7J7/JSplxbTmBQ5ms6QpqNYm672H0Vu9ZVKVngQ+ii4R/byguVEUZQyeg44g==",
-      "devOptional": true,
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "csstype": "^3.0.2"
@@ -3827,7 +3874,7 @@
       "version": "19.1.6",
       "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-19.1.6.tgz",
       "integrity": "sha512-4hOiT/dwO8Ko0gV1m/TJZYk3y0KBnY9vzDh7W+DH17b2HFSOGgdj33dhihPeuy3l0q23+4e+hoXHV6hCC4dCXw==",
-      "devOptional": true,
+      "dev": true,
       "license": "MIT",
       "peerDependencies": {
         "@types/react": "^19.0.0"
@@ -5125,7 +5172,7 @@
       "version": "3.1.3",
       "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.3.tgz",
       "integrity": "sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==",
-      "devOptional": true,
+      "dev": true,
       "license": "MIT"
     },
     "node_modules/data-uri-to-buffer": {
@@ -5502,6 +5549,7 @@
       "version": "0.25.6",
       "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.25.6.tgz",
       "integrity": "sha512-GVuzuUwtdsghE3ocJ9Bs8PNoF13HNQ5TXbEi2AhvVb8xU1Iwt9Fos9FEamfoee+u/TOsn7GUWc04lz46n2bbTg==",
+      "dev": true,
       "hasInstallScript": true,
       "license": "MIT",
       "bin": {
@@ -6088,6 +6136,7 @@
       "version": "2.3.3",
       "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
       "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
+      "dev": true,
       "hasInstallScript": true,
       "license": "MIT",
       "optional": true,
@@ -7447,6 +7496,7 @@
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz",
       "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==",
+      "dev": true,
       "license": "ISC"
     },
     "node_modules/picomatch": {
@@ -7475,6 +7525,7 @@
       "version": "8.5.6",
       "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.6.tgz",
       "integrity": "sha512-3Ybi1tAuwAP9s0r1UQ2J4n5Y0G05bJkpUIO0/bI9MhwmD70S5aTWbXGBwxHrelT+XM1k6dM0pk+SwNkpTRN7Pg==",
+      "dev": true,
       "funding": [
         {
           "type": "opencollective",
@@ -7510,6 +7561,7 @@
       "version": "3.3.11",
       "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.11.tgz",
       "integrity": "sha512-N8SpfPUnUp1bK+PMYW8qSWdl9U+wwNWI4QKxOYDy9JAro3WMX7p2OeVRF9v+347pnakNevPmiHhNmZ2HbFA76w==",
+      "dev": true,
       "funding": [
         {
           "type": "github",
@@ -7931,6 +7983,7 @@
       "version": "4.45.0",
       "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.45.0.tgz",
       "integrity": "sha512-WLjEcJRIo7i3WDDgOIJqVI2d+lAC3EwvOGy+Xfq6hs+GQuAA4Di/H72xmXkOhrIWFg2PFYSKZYfH0f4vfKXN4A==",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@types/estree": "1.0.8"
@@ -8450,6 +8503,7 @@
       "version": "0.2.14",
       "resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.14.tgz",
       "integrity": "sha512-tX5e7OM1HnYr2+a2C/4V0htOcSQcoSTH9KgJnVvNm5zm/cyEWKJ7j7YutsH9CxMdtOkkLFy2AHrMci9IM8IPZQ==",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "fdir": "^6.4.4",
@@ -8466,6 +8520,7 @@
       "version": "6.4.6",
       "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.4.6.tgz",
       "integrity": "sha512-hiFoqpyZcfNm1yc4u8oWCf9A2c4D3QjCrks3zmoVKVxpQRzmPNar1hUJcBG2RQHvEVGDN+Jm81ZheVLAQMK6+w==",
+      "dev": true,
       "license": "MIT",
       "peerDependencies": {
         "picomatch": "^3 || ^4"
@@ -8480,6 +8535,7 @@
       "version": "4.0.2",
       "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.2.tgz",
       "integrity": "sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg==",
+      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=12"
@@ -8644,7 +8700,7 @@
       "version": "5.9.2",
       "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.9.2.tgz",
       "integrity": "sha512-CWBzXQrc/qOkhidw1OzBTQuYRbfyxDXJMVJ1XNwUHGROVmuaeiEm3OslpZ1RV96d7SKKjZKrSJu3+t/xlw3R9A==",
-      "devOptional": true,
+      "dev": true,
       "license": "Apache-2.0",
       "bin": {
         "tsc": "bin/tsc",
@@ -8821,6 +8877,7 @@
       "version": "7.1.3",
       "resolved": "https://registry.npmjs.org/vite/-/vite-7.1.3.tgz",
       "integrity": "sha512-OOUi5zjkDxYrKhTV3V7iKsoS37VUM7v40+HuwEmcrsf11Cdx9y3DIr2Px6liIcZFwt3XSRpQvFpL3WVy7ApkGw==",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "esbuild": "^0.25.0",
@@ -8895,6 +8952,7 @@
       "version": "6.5.0",
       "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.5.0.tgz",
       "integrity": "sha512-tIbYtZbucOs0BRGqPJkshJUYdL+SDH7dVM8gjy+ERp3WAUjLEFJE+02kanyHtwjWOnwrKYBiwAmM0p4kLJAnXg==",
+      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=12.0.0"
@@ -8912,6 +8970,7 @@
       "version": "4.0.3",
       "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz",
       "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
+      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=12"
diff --git a/src/ui/Desktop/Admin/AdminSettings.tsx b/src/ui/Desktop/Admin/AdminSettings.tsx
index beb65441..ca1ab4f0 100644
--- a/src/ui/Desktop/Admin/AdminSettings.tsx
+++ b/src/ui/Desktop/Admin/AdminSettings.tsx
@@ -1,5 +1,5 @@
 import React from "react";
-import {useSidebar} from "@/components/ui/sidebar.tsx";
+import {useSidebar} from "@/components/ui/sidebar";
 import {Separator} from "@/components/ui/separator.tsx";
 import {Button} from "@/components/ui/button.tsx";
 import {Alert, AlertDescription, AlertTitle} from "@/components/ui/alert.tsx";
@@ -79,9 +79,7 @@ export function AdminSettings({isTopbarOpen = true}: AdminSettingsProps): React.
             .then(res => {
                 if (res) setOidcConfig(res);
             })
-            .catch(error => {
-                // Silently ignore OIDC config fetch errors - this is expected when OIDC is not configured
-                console.debug('OIDC config not available:', error.message);
+            .catch(() => {
             });
         fetchUsers();
     }, []);
@@ -208,7 +206,7 @@ export function AdminSettings({isTopbarOpen = true}: AdminSettingsProps): React.
              className="bg-[#18181b] text-white rounded-lg border-2 border-[#303032] overflow-hidden">
             <div className="h-full w-full flex flex-col">
                 <div className="flex items-center justify-between px-3 pt-2 pb-2">
-                    <h1 className="font-bold text-lg">Admin Settings</h1>
+                    <h1 className="font-bold text-lg">{t('admin.title')}</h1>
                 </div>
                 <Separator className="p-0.25 w-full"/>
 
@@ -221,11 +219,11 @@ export function AdminSettings({isTopbarOpen = true}: AdminSettingsProps): React.
                             </TabsTrigger>
                             <TabsTrigger value="oidc" className="flex items-center gap-2">
                                 <Shield className="h-4 w-4"/>
-                                {t('admin.oidc')}
+                                OIDC
                             </TabsTrigger>
                             <TabsTrigger value="users" className="flex items-center gap-2">
                                 <Users className="h-4 w-4"/>
-                                Users
+                                {t('admin.users')}
                             </TabsTrigger>
                             <TabsTrigger value="admins" className="flex items-center gap-2">
                                 <Shield className="h-4 w-4"/>
@@ -246,9 +244,8 @@ export function AdminSettings({isTopbarOpen = true}: AdminSettingsProps): React.
 
                         <TabsContent value="oidc" className="space-y-6">
                             <div className="space-y-4">
-                                <h3 className="text-lg font-semibold">External Authentication (OIDC)</h3>
-                                <p className="text-sm text-muted-foreground">Configure external identity provider for
-                                    OIDC/OAuth2 authentication.</p>
+                                <h3 className="text-lg font-semibold">{t('admin.externalAuthentication')}</h3>
+                                <p className="text-sm text-muted-foreground">{t('admin.configureExternalProvider')}</p>
 
                                 {oidcError && (
                                     <Alert variant="destructive">
@@ -259,60 +256,54 @@ export function AdminSettings({isTopbarOpen = true}: AdminSettingsProps): React.
 
                                 <form onSubmit={handleOIDCConfigSubmit} className="space-y-4">
                                     <div className="space-y-2">
-                                        <Label htmlFor="client_id">Client ID</Label>
+                                        <Label htmlFor="client_id">{t('admin.clientId')}</Label>
                                         <Input id="client_id" value={oidcConfig.client_id}
                                                onChange={(e) => handleOIDCConfigChange('client_id', e.target.value)}
-                                               placeholder="your-client-id" required/>
+                                               placeholder={t('placeholders.clientId')} required/>
                                     </div>
                                     <div className="space-y-2">
-                                        <Label htmlFor="client_secret">Client Secret</Label>
+                                        <Label htmlFor="client_secret">{t('admin.clientSecret')}</Label>
                                         <Input id="client_secret" type="password" value={oidcConfig.client_secret}
                                                onChange={(e) => handleOIDCConfigChange('client_secret', e.target.value)}
-                                               placeholder="your-client-secret" required/>
+                                               placeholder={t('placeholders.clientSecret')} required/>
                                     </div>
                                     <div className="space-y-2">
-                                        <Label htmlFor="authorization_url">Authorization URL</Label>
+                                        <Label htmlFor="authorization_url">{t('admin.authorizationUrl')}</Label>
                                         <Input id="authorization_url" value={oidcConfig.authorization_url}
                                                onChange={(e) => handleOIDCConfigChange('authorization_url', e.target.value)}
-                                               placeholder="https://your-provider.com/application/o/authorize/"
+                                               placeholder={t('placeholders.authUrl')}
                                                required/>
                                     </div>
                                     <div className="space-y-2">
-                                        <Label htmlFor="issuer_url">Issuer URL</Label>
+                                        <Label htmlFor="issuer_url">{t('admin.issuerUrl')}</Label>
                                         <Input id="issuer_url" value={oidcConfig.issuer_url}
                                                onChange={(e) => handleOIDCConfigChange('issuer_url', e.target.value)}
-                                               placeholder="https://your-provider.com/application/o/termix/" required/>
+                                               placeholder={t('placeholders.redirectUrl')} required/>
                                     </div>
                                     <div className="space-y-2">
-                                        <Label htmlFor="token_url">Token URL</Label>
+                                        <Label htmlFor="token_url">{t('admin.tokenUrl')}</Label>
                                         <Input id="token_url" value={oidcConfig.token_url}
                                                onChange={(e) => handleOIDCConfigChange('token_url', e.target.value)}
-                                               placeholder="https://your-provider.com/application/o/token/" required/>
+                                               placeholder={t('placeholders.tokenUrl')} required/>
                                     </div>
                                     <div className="space-y-2">
-                                        <Label htmlFor="identifier_path">User Identifier Path</Label>
+                                        <Label htmlFor="identifier_path">{t('admin.userIdentifierPath')}</Label>
                                         <Input id="identifier_path" value={oidcConfig.identifier_path}
                                                onChange={(e) => handleOIDCConfigChange('identifier_path', e.target.value)}
-                                               placeholder="sub" required/>
+                                               placeholder={t('placeholders.userIdField')} required/>
                                     </div>
                                     <div className="space-y-2">
-                                        <Label htmlFor="name_path">Display Name Path</Label>
+                                        <Label htmlFor="name_path">{t('admin.displayNamePath')}</Label>
                                         <Input id="name_path" value={oidcConfig.name_path}
                                                onChange={(e) => handleOIDCConfigChange('name_path', e.target.value)}
-                                               placeholder="name" required/>
+                                               placeholder={t('placeholders.usernameField')} required/>
                                     </div>
                                     <div className="space-y-2">
-                                        <Label htmlFor="scopes">Scopes</Label>
+                                        <Label htmlFor="scopes">{t('admin.scopes')}</Label>
                                         <Input id="scopes" value={oidcConfig.scopes}
                                                onChange={(e) => handleOIDCConfigChange('scopes', e.target.value)}
                                                placeholder={t('placeholders.scopes')} required/>
                                     </div>
-                                    <div className="space-y-2">
-                                        <Label htmlFor="userinfo_url">{t('admin.overrideUserInfoUrl')}</Label>
-                                        <Input id="userinfo_url" value={oidcConfig.userinfo_url}
-                                               onChange={(e) => handleOIDCConfigChange('userinfo_url', e.target.value)}
-                                               placeholder={t('placeholders.userinfoUrl')}/>
-                                    </div>
                                     <div className="space-y-2">
                                         <Label htmlFor="userinfo_url">{t('admin.overrideUserInfoUrl')}</Label>
                                         <Input id="userinfo_url" value={oidcConfig.userinfo_url}
@@ -321,7 +312,7 @@ export function AdminSettings({isTopbarOpen = true}: AdminSettingsProps): React.
                                     </div>
                                     <div className="flex gap-2 pt-2">
                                         <Button type="submit" className="flex-1"
-                                                disabled={oidcLoading}>{oidcLoading ? "Saving..." : "Save Configuration"}</Button>
+                                                disabled={oidcLoading}>{oidcLoading ? t('admin.saving') : t('admin.saveConfiguration')}</Button>
                                         <Button type="button" variant="outline" onClick={() => setOidcConfig({
                                             client_id: '',
                                             client_secret: '',
@@ -341,20 +332,20 @@ export function AdminSettings({isTopbarOpen = true}: AdminSettingsProps): React.
                         <TabsContent value="users" className="space-y-6">
                             <div className="space-y-4">
                                 <div className="flex items-center justify-between">
-                                    <h3 className="text-lg font-semibold">User Management</h3>
+                                    <h3 className="text-lg font-semibold">{t('admin.userManagement')}</h3>
                                     <Button onClick={fetchUsers} disabled={usersLoading} variant="outline"
-                                            size="sm">{usersLoading ? "Loading..." : "Refresh"}</Button>
+                                            size="sm">{usersLoading ? t('admin.loading') : t('admin.refresh')}</Button>
                                 </div>
                                 {usersLoading ? (
-                                    <div className="text-center py-8 text-muted-foreground">Loading users...</div>
+                                    <div className="text-center py-8 text-muted-foreground">{t('admin.loadingUsers')}</div>
                                 ) : (
                                     <div className="border rounded-md overflow-hidden">
                                         <Table>
                                             <TableHeader>
                                                 <TableRow>
-                                                    <TableHead className="px-4">Username</TableHead>
-                                                    <TableHead className="px-4">Type</TableHead>
-                                                    <TableHead className="px-4">Actions</TableHead>
+                                                    <TableHead className="px-4">{t('admin.username')}</TableHead>
+                                                    <TableHead className="px-4">{t('admin.type')}</TableHead>
+                                                    <TableHead className="px-4">{t('admin.actions')}</TableHead>
                                                 </TableRow>
                                             </TableHeader>
                                             <TableBody>
@@ -364,15 +355,15 @@ export function AdminSettings({isTopbarOpen = true}: AdminSettingsProps): React.
                                                             {user.username}
                                                             {user.is_admin && (
                                                                 <span
-                                                                    className="ml-2 inline-flex items-center px-2 py-1 rounded-full text-xs font-medium bg-muted/50 text-muted-foreground border border-border">Admin</span>
+                                                                    className="ml-2 inline-flex items-center px-2 py-1 rounded-full text-xs font-medium bg-muted/50 text-muted-foreground border border-border">{t('admin.adminBadge')}</span>
                                                             )}
                                                         </TableCell>
                                                         <TableCell
-                                                            className="px-4">{user.is_oidc ? "External" : "Local"}</TableCell>
+                                                            className="px-4">{user.is_oidc ? t('admin.external') : t('admin.local')}</TableCell>
                                                         <TableCell className="px-4">
                                                             <Button variant="ghost" size="sm"
                                                                     onClick={() => handleDeleteUser(user.username)}
-                                                                    className="text-red-600 hover:text-red-700 hover:bg-red-900/20 dark:hover:bg-red-900/30"
+                                                                    className="text-red-600 hover:text-red-700 hover:bg-red-50"
                                                                     disabled={user.is_admin}>
                                                                 <Trash2 className="h-4 w-4"/>
                                                             </Button>
@@ -388,18 +379,18 @@ export function AdminSettings({isTopbarOpen = true}: AdminSettingsProps): React.
 
                         <TabsContent value="admins" className="space-y-6">
                             <div className="space-y-6">
-                                <h3 className="text-lg font-semibold">Admin Management</h3>
+                                <h3 className="text-lg font-semibold">{t('admin.adminManagement')}</h3>
                                 <div className="space-y-4 p-6 border rounded-md bg-muted/50">
-                                    <h4 className="font-medium">Make User Admin</h4>
+                                    <h4 className="font-medium">{t('admin.makeUserAdmin')}</h4>
                                     <form onSubmit={handleMakeUserAdmin} className="space-y-4">
                                         <div className="space-y-2">
-                                            <Label htmlFor="new-admin-username">Username</Label>
+                                            <Label htmlFor="new-admin-username">{t('admin.username')}</Label>
                                             <div className="flex gap-2">
                                                 <Input id="new-admin-username" value={newAdminUsername}
                                                        onChange={(e) => setNewAdminUsername(e.target.value)}
                                                        placeholder={t('admin.enterUsernameToMakeAdmin')} required/>
                                                 <Button type="submit"
-                                                        disabled={makeAdminLoading || !newAdminUsername.trim()}>{makeAdminLoading ? "Adding..." : "Make Admin"}</Button>
+                                                        disabled={makeAdminLoading || !newAdminUsername.trim()}>{makeAdminLoading ? t('admin.adding') : t('admin.makeAdmin')}</Button>
                                             </div>
                                         </div>
                                         {makeAdminError && (
@@ -413,14 +404,14 @@ export function AdminSettings({isTopbarOpen = true}: AdminSettingsProps): React.
                                 </div>
 
                                 <div className="space-y-4">
-                                    <h4 className="font-medium">Current Admins</h4>
+                                    <h4 className="font-medium">{t('admin.currentAdmins')}</h4>
                                     <div className="border rounded-md overflow-hidden">
                                         <Table>
                                             <TableHeader>
                                                 <TableRow>
-                                                    <TableHead className="px-4">Username</TableHead>
-                                                    <TableHead className="px-4">Type</TableHead>
-                                                    <TableHead className="px-4">Actions</TableHead>
+                                                    <TableHead className="px-4">{t('admin.username')}</TableHead>
+                                                    <TableHead className="px-4">{t('admin.type')}</TableHead>
+                                                    <TableHead className="px-4">{t('admin.actions')}</TableHead>
                                                 </TableRow>
                                             </TableHeader>
                                             <TableBody>
@@ -432,13 +423,13 @@ export function AdminSettings({isTopbarOpen = true}: AdminSettingsProps): React.
                                                                 className="ml-2 inline-flex items-center px-2 py-1 rounded-full text-xs font-medium bg-muted/50 text-muted-foreground border border-border">{t('admin.adminBadge')}</span>
                                                         </TableCell>
                                                         <TableCell
-                                                            className="px-4">{admin.is_oidc ? "External" : "Local"}</TableCell>
+                                                            className="px-4">{admin.is_oidc ? t('admin.external') : t('admin.local')}</TableCell>
                                                         <TableCell className="px-4">
                                                             <Button variant="ghost" size="sm"
                                                                     onClick={() => handleRemoveAdminStatus(admin.username)}
-                                                                    className="text-orange-600 hover:text-orange-700 hover:bg-orange-900/20 dark:hover:bg-orange-900/30">
+                                                                    className="text-orange-600 hover:text-orange-700 hover:bg-orange-50">
                                                                 <Shield className="h-4 w-4"/>
-                                                                Remove Admin
+                                                                {t('admin.removeAdminButton')}
                                                             </Button>
                                                         </TableCell>
                                                     </TableRow>
diff --git a/src/ui/Desktop/Homepage/HomepageAuth.tsx b/src/ui/Desktop/Homepage/HomepageAuth.tsx
index f75b9e91..fa3026ed 100644
--- a/src/ui/Desktop/Homepage/HomepageAuth.tsx
+++ b/src/ui/Desktop/Homepage/HomepageAuth.tsx
@@ -1,4 +1,5 @@
 import React, {useState, useEffect} from "react";
+import {Eye, EyeOff} from "lucide-react";
 import {cn} from "@/lib/utils.ts";
 import {Button} from "@/components/ui/button.tsx";
 import {Input} from "@/components/ui/input.tsx";
@@ -60,6 +61,16 @@ export function HomepageAuth({
     const [signupConfirmPassword, setSignupConfirmPassword] = useState("");
     const [loading, setLoading] = useState(false);
     const [oidcLoading, setOidcLoading] = useState(false);
+    const [visibility, setVisibility] = useState({
+    password: false,
+    signupConfirm: false,
+    resetNew: false,
+    resetConfirm: false
+});
+    const toggleVisibility = (field: keyof typeof visibility) => {
+    setVisibility(prev => ({ ...prev, [field]: !prev[field] }));
+};
+
     const [error, setError] = useState<string | null>(null);
     const [internalLoggedIn, setInternalLoggedIn] = useState(false);
     const [firstUser, setFirstUser] = useState(false);
@@ -674,31 +685,53 @@ export function HomepageAuth({
                                             </div>
                                             <div className="flex flex-col gap-5">
                                                 <div className="flex flex-col gap-2">
-                                                    <Label htmlFor="new-password">{t('auth.newPassword')}</Label>
-                                                    <Input
-                                                        id="new-password"
-                                                        type="password"
-                                                        required
-                                                        className="h-11 text-base focus:ring-2 focus:ring-primary/50 transition-all duration-200"
-                                                        value={newPassword}
-                                                        onChange={e => setNewPassword(e.target.value)}
-                                                        disabled={resetLoading}
-                                                        autoComplete="new-password"
-                                                    />
-                                                </div>
-                                                <div className="flex flex-col gap-2">
-                                                    <Label htmlFor="confirm-password">{t('auth.confirmNewPassword')}</Label>
-                                                    <Input
-                                                        id="confirm-password"
-                                                        type="password"
-                                                        required
-                                                        className="h-11 text-base focus:ring-2 focus:ring-primary/50 transition-all duration-200"
-                                                        value={confirmPassword}
-                                                        onChange={e => setConfirmPassword(e.target.value)}
-                                                        disabled={resetLoading}
-                                                        autoComplete="new-password"
-                                                    />
-                                                </div>
+                                            <Label htmlFor="new-password">{t('auth.newPassword')}</Label>
+                                            <div className="relative">
+                                                <Input
+                                                    id="new-password"
+                                                    type={visibility.resetNew ? "text" : "password"}
+                                                    required
+                                                    className="h-11 text-base focus:ring-2 focus:ring-primary/50 transition-all duration-200 pr-10"
+                                                    value={newPassword}
+                                                    onChange={e => setNewPassword(e.target.value)}
+                                                    disabled={resetLoading}
+                                                    autoComplete="new-password"
+                                                />
+                                                <Button
+                                                    type="button"
+                                                    variant="ghost"
+                                                    size="sm"
+                                                    onClick={() => toggleVisibility('resetNew')}
+                                                    className="absolute right-0 top-0 h-full px-3 py-2"
+                                                >
+                                                    {visibility.resetNew ? <EyeOff className="h-4 w-4 text-muted-foreground" /> : <Eye className="h-4 w-4 text-muted-foreground" />}
+                                                </Button>
+                                            </div>
+                                        </div>
+                                                                                        <div className="flex flex-col gap-2">
+                                            <Label htmlFor="confirm-password">{t('auth.confirmNewPassword')}</Label>
+                                            <div className="relative">
+                                                <Input
+                                                    id="confirm-password"
+                                                    type={visibility.resetConfirm ? "text" : "password"}
+                                                    required
+                                                    className="h-11 text-base focus:ring-2 focus:ring-primary/50 transition-all duration-200 pr-10"
+                                                    value={confirmPassword}
+                                                    onChange={e => setConfirmPassword(e.target.value)}
+                                                    disabled={resetLoading}
+                                                    autoComplete="new-password"
+                                                />
+                                                <Button
+                                                    type="button"
+                                                    variant="ghost"
+                                                    size="sm"
+                                                    onClick={() => toggleVisibility('resetConfirm')}
+                                                    className="absolute right-0 top-0 h-full px-3 py-2"
+                                                >
+                                                    {visibility.resetConfirm ? <EyeOff className="h-4 w-4 text-muted-foreground" /> : <Eye className="h-4 w-4 text-muted-foreground" />}
+                                                </Button>
+                                            </div>
+                                        </div>
                                                 <Button
                                                     type="button"
                                                     className="w-full h-11 text-base font-semibold"
@@ -741,20 +774,50 @@ export function HomepageAuth({
                                 />
                             </div>
                             <div className="flex flex-col gap-2">
-                                <Label htmlFor="password">{t('common.password')}</Label>
-                                <Input id="password" type="password" required className="h-11 text-base"
-                                       value={password} onChange={e => setPassword(e.target.value)}
-                                       disabled={loading || internalLoggedIn}/>
+                            <Label htmlFor="password">{t('common.password')}</Label>
+                            <div className="relative">
+                                <Input
+                                    id="password"
+                                    type={visibility.password ? "text" : "password"}
+                                    required
+                                    className="h-11 text-base pr-10"
+                                    value={password}
+                                    onChange={e => setPassword(e.target.value)}
+                                    disabled={loading || internalLoggedIn}/>
+                                <Button
+                                    type="button"
+                                    variant="ghost"
+                                    size="sm"
+                                    onClick={() => toggleVisibility('password')}
+                                    className="absolute right-0 top-0 h-full px-3 py-2"
+                                >
+                                    {visibility.password ? <EyeOff className="h-4 w-4 text-muted-foreground" /> : <Eye className="h-4 w-4 text-muted-foreground" />}
+                                </Button>
                             </div>
-                            {tab === "signup" && (
-                                <div className="flex flex-col gap-2">
-                                    <Label htmlFor="signup-confirm-password">{t('common.confirmPassword')}</Label>
-                                    <Input id="signup-confirm-password" type="password" required
-                                           className="h-11 text-base"
-                                           value={signupConfirmPassword}
-                                           onChange={e => setSignupConfirmPassword(e.target.value)}
-                                           disabled={loading || internalLoggedIn}/>
-                                </div>
+                        </div>
+                                                    {tab === "signup" && (
+                                                        <div className="flex flex-col gap-2">
+                            <Label htmlFor="signup-confirm-password">{t('common.confirmPassword')}</Label>
+                            <div className="relative">
+                                <Input
+                                    id="signup-confirm-password"
+                                    type={visibility.signupConfirm ? "text" : "password"}
+                                    required
+                                    className="h-11 text-base pr-10"
+                                    value={signupConfirmPassword}
+                                    onChange={e => setSignupConfirmPassword(e.target.value)}
+                                    disabled={loading || internalLoggedIn}/>
+                                <Button
+                                    type="button"
+                                    variant="ghost"
+                                    size="sm"
+                                    onClick={() => toggleVisibility('signupConfirm')}
+                                    className="absolute right-0 top-0 h-full px-3 py-2"
+                                >
+                                    {visibility.signupConfirm ? <EyeOff className="h-4 w-4 text-muted-foreground" /> : <Eye className="h-4 w-4 text-muted-foreground" />}
+                                </Button>
+                            </div>
+                        </div>
                             )}
                             <Button type="submit" className="w-full h-11 mt-2 text-base font-semibold"
                                     disabled={loading || internalLoggedIn}>