Index: interfejs/change-password.html
===================================================================
--- interfejs/change-password.html	(revision 2d1ec46933bbbd721e985423c96581bc0a7485ed)
+++ interfejs/change-password.html	(revision 69f2a41cff81a4c7825abb68eb0f0eff6818e4e5)
@@ -17,5 +17,5 @@
             <li><a href="index.html">Home</a></li>
             <li><a href="products.html">Products</a></li>
-            <li><a href="#" id="dashboard-link">Dashboard</a></li>
+            <li><a href="login.html">Login</a></li>
         </ul>
     </nav>
@@ -23,12 +23,17 @@
 
 <main>
-    <div class="auth-container">
+    <div class="form-container">
         <h2>Change Password</h2>
-        <div id="password-message" class="message"></div>
+        <p class="form-subtitle" id="password-message">Please set a new password</p>
 
         <form id="change-password-form" class="form">
             <div class="form-group">
+                <label for="current-password">Current Password</label>
+                <input type="password" id="current-password" name="current-password" required>
+            </div>
+
+            <div class="form-group">
                 <label for="new-password">New Password</label>
-                <input type="password" id="new-password" required>
+                <input type="password" id="new-password" name="new-password" required>
                 <small class="password-hint">At least 8 characters with uppercase, lowercase, number, and special character</small>
             </div>
@@ -36,8 +41,10 @@
             <div class="form-group">
                 <label for="confirm-password">Confirm New Password</label>
-                <input type="password" id="confirm-password" required>
+                <input type="password" id="confirm-password" name="confirm-password" required>
             </div>
 
-            <button type="submit" class="btn-primary">Change Password</button>
+            <div class="form-group">
+                <button type="submit" class="btn-primary btn-full">Change Password</button>
+            </div>
         </form>
     </div>
@@ -57,8 +64,4 @@
             </ul>
         </div>
-        <div class="footer-section">
-            <h3>Contact</h3>
-            <p>Email: support@handcraft.com</p>
-        </div>
     </div>
     <div class="footer-bottom">
@@ -69,35 +72,15 @@
 <script src="script.js"></script>
 <script>
-    document.addEventListener('DOMContentLoaded', async function() {
+    document.addEventListener('DOMContentLoaded', () => {
         const urlParams = new URLSearchParams(window.location.search);
-        const forced = urlParams.get('forced');
-        const redirect = urlParams.get('redirect');
+        const isForced = urlParams.get('forced') === 'true';
 
-        // Check if user is authenticated for password change
-        try {
-            const user = await loadUserData();
-            if (!user) {
-                window.location.href = 'login.html';
-                return;
-            }
-        } catch (error) {
-            console.error('Error loading user:', error);
-            window.location.href = 'login.html';
-            return;
+        if (isForced) {
+            document.getElementById('password-message').textContent =
+                'You must change your password before continuing.';
         }
 
-        if (forced === 'true') {
-            const messageDiv = document.getElementById('password-message');
-            messageDiv.className = 'message warning';
-            messageDiv.innerHTML = '⚠️ You are required to change your password before continuing.';
-        }
-
-        // Store redirect URL in session storage
-        if (redirect) {
-            sessionStorage.setItem('passwordChangeRedirect', redirect);
-        }
-
-        // Handle form submission
-        document.getElementById('change-password-form').addEventListener('submit', async function(e) {
+        const form = document.getElementById('change-password-form');
+        form.addEventListener('submit', async (e) => {
             e.preventDefault();
 
@@ -106,17 +89,13 @@
 
             if (newPassword !== confirmPassword) {
-                showMessage('Passwords do not match', 'error');
+                alert('New passwords do not match');
                 return;
             }
 
-            // Password validation
-            const passwordRegex = /^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[@$!%*?&])[A-Za-z\d@$!%*?&]{8,}$/;
-            if (!passwordRegex.test(newPassword)) {
-                showMessage('Password must have at least 8 characters, including uppercase, lowercase, number and special character', 'error');
-                return;
-            }
-
-            // Get redirect from session storage or URL
-            const redirectTo = sessionStorage.getItem('passwordChangeRedirect') || '';
+            const formData = {
+                currentPassword: document.getElementById('current-password').value,
+                newPassword: newPassword,
+                confirmPassword: confirmPassword
+            };
 
             try {
@@ -124,9 +103,5 @@
                     method: 'POST',
                     headers: { 'Content-Type': 'application/json' },
-                    body: JSON.stringify({
-                        newPassword,
-                        confirmPassword,
-                        redirectTo: redirectTo
-                    })
+                    body: JSON.stringify(formData)
                 });
 
@@ -134,25 +109,14 @@
 
                 if (data.success) {
-                    showMessage('Password changed successfully! Redirecting...', 'success');
-                    sessionStorage.removeItem('passwordChangeRedirect');
-
-                    // Redirect to appropriate dashboard
-                    setTimeout(() => {
-                        window.location.href = data.redirectTo || 'dashboard.html';
-                    }, 1500);
+                    alert('Password changed successfully!');
+                    window.location.href = data.redirectTo || 'dashboard.html';
                 } else {
-                    showMessage(data.message || 'Failed to change password', 'error');
+                    alert(data.message || 'Failed to change password');
                 }
             } catch (error) {
-                console.error('Error changing password:', error);
-                showMessage('An error occurred. Please try again.', 'error');
+                console.error('Password change error:', error);
+                alert('An error occurred');
             }
         });
-
-        function showMessage(msg, type) {
-            const messageDiv = document.getElementById('password-message');
-            messageDiv.className = 'message ' + type;
-            messageDiv.textContent = msg;
-        }
     });
 </script>