diff --git a/webui/src/pages/AccountSettings.jsx b/webui/src/pages/AccountSettings.jsx
index 5616e39..f65716b 100644
--- a/webui/src/pages/AccountSettings.jsx
+++ b/webui/src/pages/AccountSettings.jsx
@@ -1,8 +1,32 @@
 import React, { useState, useEffect } from 'react';
-import { CheckCircle, XCircle, AlertTriangle } from 'lucide-react';
+import { CheckCircle, XCircle, AlertTriangle, Eye, EyeOff } from 'lucide-react';
 import { useAuth } from '../contexts/AuthContext';
 import { authAPI } from '../services/api';
 
+function PasswordInput({ value, onChange, autoComplete, required, className }) {
+  const [show, setShow] = useState(false);
+  return (
+    <div className="relative">
+      <input
+        type={show ? 'text' : 'password'}
+        value={value}
+        onChange={onChange}
+        autoComplete={autoComplete}
+        required={required}
+        className={`${className} pr-9`}
+      />
+      <button
+        type="button"
+        onClick={() => setShow(v => !v)}
+        className="absolute inset-y-0 right-0 flex items-center px-2.5 text-gray-400 hover:text-gray-600"
+        tabIndex={-1}
+      >
+        {show ? <EyeOff className="h-4 w-4" /> : <Eye className="h-4 w-4" />}
+      </button>
+    </div>
+  );
+}
+
 export default function AccountSettings() {
   const { user, changePassword } = useAuth();
 
@@ -99,8 +123,7 @@ export default function AccountSettings() {
         <form onSubmit={handleChangePassword} className="space-y-4 max-w-sm">
           <div>
             <label className="block text-sm text-gray-600 mb-1">Current password</label>
-            <input
-              type="password"
+            <PasswordInput
               value={oldPassword}
               onChange={e => setOldPassword(e.target.value)}
               autoComplete="current-password"
@@ -110,8 +133,7 @@ export default function AccountSettings() {
           </div>
           <div>
             <label className="block text-sm text-gray-600 mb-1">New password</label>
-            <input
-              type="password"
+            <PasswordInput
               value={newPassword}
               onChange={e => setNewPassword(e.target.value)}
               autoComplete="new-password"
@@ -123,8 +145,7 @@ export default function AccountSettings() {
           </div>
           <div>
             <label className="block text-sm text-gray-600 mb-1">Confirm new password</label>
-            <input
-              type="password"
+            <PasswordInput
               value={confirmPassword}
               onChange={e => setConfirmPassword(e.target.value)}
               autoComplete="new-password"
@@ -177,8 +198,7 @@ export default function AccountSettings() {
             </div>
             <div>
               <label className="block text-sm text-gray-600 mb-1">New password</label>
-              <input
-                type="password"
+              <PasswordInput
                 value={adminNewPw}
                 onChange={e => { setAdminNewPw(e.target.value); setAdminError(''); }}
                 autoComplete="new-password"
diff --git a/webui/src/pages/Login.jsx b/webui/src/pages/Login.jsx
index a0f94f6..805c3e1 100644
--- a/webui/src/pages/Login.jsx
+++ b/webui/src/pages/Login.jsx
@@ -1,5 +1,6 @@
 import React, { useState } from 'react';
 import { useNavigate } from 'react-router-dom';
+import { Eye, EyeOff } from 'lucide-react';
 import { useAuth } from '../contexts/AuthContext';
 
 export default function Login() {
@@ -9,6 +10,7 @@ export default function Login() {
   const [password, setPassword] = useState('');
   const [error, setError] = useState('');
   const [loading, setLoading] = useState(false);
+  const [showPassword, setShowPassword] = useState(false);
 
   const handleSubmit = async e => {
     e.preventDefault();
@@ -19,7 +21,13 @@ export default function Login() {
       navigate('/', { replace: true });
     } catch (err) {
       if (err.response?.status === 423) {
-        setError('Account locked. Too many failed attempts. Try again later.');
+        const lockedUntil = err.response?.data?.locked_until;
+        if (lockedUntil) {
+          const mins = Math.ceil((new Date(lockedUntil + 'Z') - Date.now()) / 60000);
+          setError(`Account locked. Try again in ${mins} minute${mins !== 1 ? 's' : ''}.`);
+        } else {
+          setError('Account locked. Too many failed attempts. Try again later.');
+        }
       } else {
         setError('Invalid username or password.');
       }
@@ -46,14 +54,24 @@ export default function Login() {
           </div>
           <div>
             <label className="block text-sm text-gray-400 mb-1">Password</label>
-            <input
-              type="password"
-              autoComplete="current-password"
-              value={password}
-              onChange={e => setPassword(e.target.value)}
-              className="w-full bg-gray-800 border border-gray-600 rounded px-3 py-2 text-white text-sm focus:outline-none focus:border-blue-500"
-              required
-            />
+            <div className="relative">
+              <input
+                type={showPassword ? 'text' : 'password'}
+                autoComplete="current-password"
+                value={password}
+                onChange={e => setPassword(e.target.value)}
+                className="w-full bg-gray-800 border border-gray-600 rounded px-3 py-2 pr-9 text-white text-sm focus:outline-none focus:border-blue-500"
+                required
+              />
+              <button
+                type="button"
+                onClick={() => setShowPassword(v => !v)}
+                className="absolute inset-y-0 right-0 flex items-center px-2.5 text-gray-400 hover:text-gray-200"
+                tabIndex={-1}
+              >
+                {showPassword ? <EyeOff className="h-4 w-4" /> : <Eye className="h-4 w-4" />}
+              </button>
+            </div>
           </div>
           {error && <p className="text-red-400 text-sm">{error}</p>}
           <button