diff --git a/public/bestellformular/bestellformular.html b/public/bestellformular/bestellformular.html
index 999319a..9b8ae8b 100644
--- a/public/bestellformular/bestellformular.html
+++ b/public/bestellformular/bestellformular.html
@@ -113,7 +113,6 @@
 
 
             const sendButton = document.getElementById('sendOrder');
-            let artikelVerfuegbarkeiten = [];
             ladeWarenkorb();
 
             // Bestellung absenden
@@ -209,7 +208,7 @@
                 const data = await response.json();
 
                 const artikelDivs = document.querySelectorAll('.Artikel');
-                artikelVerfuegbarkeiten = [];
+                let artikelVerfuegbarkeiten = [];
 
                 artikelDivs.forEach(div => {
                     const artikelNrInput = div.querySelector('.ArtikelNrText');
diff --git a/public/inputHandler/verifyPassword.js b/public/inputHandler/verifyPassword.js
new file mode 100644
index 0000000..e69de29
diff --git a/public/login/login.html b/public/login/login.html
index 6276142..05f2f2c 100644
--- a/public/login/login.html
+++ b/public/login/login.html
@@ -32,7 +32,7 @@
 
             <!-- Eingabefeld für Benutzername -->
             <div class="input-group">
-                <input id="email" type="text" placeholder="E-Mail" required/>
+                <input id="email" type="email" placeholder="E-Mail" required/>
                 <i class="icon fas fa-user"></i>
             </div>
 
@@ -43,7 +43,7 @@
             </div>
 
             <!-- Login-Button -->
-            <button type="submit" class="login-btn">Login</button>
+            <button type="submit" class="login-btn" id="submit">Login</button>
 
             <!-- Link zur Registrierungsseite -->
             <p class="register-text">
@@ -54,7 +54,7 @@
 </main>
 
 <script>
-    document.getElementById('submit').addEventListener('click', async (event) => {
+    document.querySelector('form').addEventListener('submit', async (event) => {
         event.preventDefault()
 
         const email = document.getElementById('email').value
diff --git a/public/registrieren/registrieren.html b/public/registrieren/registrieren.html
index f820f04..a7a9836 100644
--- a/public/registrieren/registrieren.html
+++ b/public/registrieren/registrieren.html
@@ -9,7 +9,6 @@
 <head>
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>Registrieren</title>
     <!-- Registrieren-CSS-Datei -->
     <link rel="stylesheet" href="./Styles/registrieren/registrieren.css">
     <!-- Haupt-CSS-Datei -->
@@ -18,6 +17,7 @@
     <link href="https://unpkg.com/boxicons@2.1.4/css/boxicons.min.css" rel="stylesheet">
     <!-- Script zum Laden von Header/Footer -->
     <script src="/header_footer"></script>
+    <title>Registrieren</title>
 </head>
 <body>
 <div class="page-container">
@@ -68,9 +68,21 @@
     </main>
 
     <script>
-        document.getElementById('register').addEventListener('click', async (event) => {
+        document.querySelector('form').addEventListener('submit', async (event) => {
             event.preventDefault();
 
+            const passwordEl = document.getElementById('regPassword')
+            const password = passwordEl.value
+            const confirmPasswordEl = document.getElementById('confirmPassword')
+            const confirmPassword = confirmPasswordEl.value
+
+            if (password !== confirmPassword) {
+                passwordEl.value = ''
+                confirmPasswordEl.value = ''
+                alert('Die Passwörter stimmen nicht überein.')
+                return
+            }
+
             const formData = {
                 name: document.getElementById('vorname').value,
                 lower_name: document.getElementById('nachname').value,
@@ -92,7 +104,7 @@
                     sessionStorage.setItem("vorname", data.name)
                     sessionStorage.setItem("nachname", data.lower_name)
                     alert('Nutzer erfolgreich hinzugefügt! Ihre Kundennummer: ' + data.id)
-                    window.location.href= '/'
+                    window.location.href = '/'
                 } else {
                     alert('Fehler bei der Registrierung.')
                 }
diff --git a/public/session_storage/login-toggle.js b/public/session_storage/login-toggle.js
new file mode 100644
index 0000000..e69de29
diff --git a/public/startseite/startseite.html b/public/startseite/startseite.html
index 8118b61..9c1dec8 100644
--- a/public/startseite/startseite.html
+++ b/public/startseite/startseite.html
@@ -31,7 +31,7 @@
         </section>
 
         <!-- Hauptinhalt -->
-        <h1>Unsere Neusten Produkte: </h1>
+        <h1>Unsere neusten Produkte: </h1>
         <section class="card-grid" id="latest-products">
             <!-- Dynamische Produkte (5 neuesten Produkte) -->
         </section>
diff --git a/scripts/einfügenHeaderFooter.js b/scripts/einfügenHeaderFooter.js
index 2f9868a..6bf84a1 100644
--- a/scripts/einfügenHeaderFooter.js
+++ b/scripts/einfügenHeaderFooter.js
@@ -21,8 +21,10 @@ document.addEventListener("DOMContentLoaded", () => {
                 // Header-Inhalt in die Seite einfügen
                 headerTarget.innerHTML = data;
 
-                // 🚀 WICHTIG: Jetzt den Warenkorb zählen, nachdem der Header geladen ist!
+                // WICHTIG: Jetzt den Warenkorb zählen, nachdem der Header geladen ist!
                 zeigeWarenkorbAnzahl();
+
+                zeigeLoginStatus();
             })
             .catch(error => {
                 // Fehlerbehandlung: Fehlermeldung im Header-Bereich anzeigen
@@ -72,4 +74,25 @@ document.addEventListener("DOMContentLoaded", () => {
         }
         console.log('Warenkorb-Anzahl:', anzahl);
     }
+
+    window.zeigeLoginStatus= function (){
+        const userId = sessionStorage.getItem('user_id')
+        const loginBtn = document.querySelector('.login-btn')
+
+        if (!loginBtn) return
+
+        if (userId) {
+            loginBtn.textContent = 'Logout'
+            loginBtn.href = '/'
+            loginBtn.addEventListener('click', (e) => {
+                e.preventDefault()
+                sessionStorage.clear()
+                alert('Sie wurden ausgeloggt.')
+                location.reload()
+            })
+        } else {
+            loginBtn.textContent = 'Login'
+            loginBtn.href= '/login'
+        }
+    }
 });
\ No newline at end of file
diff --git a/scripts/example.js b/scripts/example.js
deleted file mode 100644
index d539db9..0000000
--- a/scripts/example.js
+++ /dev/null
@@ -1,23 +0,0 @@
-let sidebarEl = document.getElementById("mySidebar")
-let mainEl = document.getElementById("main")
-
-/* Set the width of the sidebar to 250px and the left margin of the page content to 250px */
-function openNav() {
-    sidebarEl.style.width = "250px";
-    mainEl.style.marginLeft = "250px";
-}
-
-/* Set the width of the sidebar to 0 and the left margin of the page content to 0 */
-function closeNav() {
-    sidebarEl.style.width = "0";
-    mainEl.style.marginLeft = "0";
-}
-
-/* Toggle the sidebar */
-function toggleNav() {
-    if (sidebarEl.offsetWidth > 0) {
-        closeNav()
-    } else {
-        openNav()
-    }
-}
\ No newline at end of file
diff --git a/scripts/login.js b/scripts/login.js
deleted file mode 100644
index 6d17a2a..0000000
--- a/scripts/login.js
+++ /dev/null
@@ -1,7 +0,0 @@
-let nameEl = document.getElementById("loginMail");
-let passwordEl = document.getElementById("loginPassword");
-
-function login() {
-    console.log(nameEl.value)
-    console.log(passwordEl.value)
-}
\ No newline at end of file
diff --git a/scripts/query/get_products.js b/scripts/query/get_products.js
deleted file mode 100644
index 9f51378..0000000
--- a/scripts/query/get_products.js
+++ /dev/null
@@ -1,17 +0,0 @@
-const mysql = require('mysql');
-
-const connection = mysql.createConnection({
-    host: "localhost",
-    user: "root",
-    password: "",
-    database: "webshop"
-})
-
-connection.connect(function (err) {
-    if (err) throw err
-    console.log("Connected to database")
-    connection.query("SELECT * FROM webshop.product LIMIT 10", function (err, result) {
-        if (err) throw err
-        console.log(result)
-    })
-})
\ No newline at end of file
diff --git a/scripts/query/get_users.js b/scripts/query/get_users.js
deleted file mode 100644
index 72caeef..0000000
--- a/scripts/query/get_users.js
+++ /dev/null
@@ -1,17 +0,0 @@
-const mysql = require('mysql');
-
-const connection = mysql.createConnection({
-    host: "localhost",
-    user: "root",
-    password: "",
-    database: "webshop"
-})
-
-connection.connect(function (err) {
-    if (err) throw err
-    console.log("Connected to database")
-    connection.query("SELECT * FROM webshop.user WHERE ID = 15", function (err, result) {
-        if (err) throw err
-        console.log(result)
-    })
-})
\ No newline at end of file
diff --git a/scripts/routes/other/route-index.js b/scripts/routes/other/route-index.js
index 0418bcc..6ba00d0 100644
--- a/scripts/routes/other/route-index.js
+++ b/scripts/routes/other/route-index.js
@@ -6,10 +6,6 @@ router.get('/', (req, res) => {
     res.sendFile(path.join(__dirname, '../../../public/startseite/startseite.html'));
 })
 
-router.get('/example', (req, res) => {
-    res.sendFile(path.join(__dirname, '../../../public/example/index.html'));
-})
-
 // Route - Login
 router.get('/login', (req, res) => {
     res.sendFile(path.join(__dirname, '../../../public/login/login.html'));
diff --git a/server.js b/server.js
index 249c18b..5ef778c 100644
--- a/server.js
+++ b/server.js
@@ -135,11 +135,15 @@ app.get('/api/products/sportwagen', async (req, res) => {
 app.post('/api/user/registration', (req, res) => {
     // SQL-Query für Nutzerregistration
     const {name, lower_name, email, passwd} = req.body;
+
     const sql = "INSERT INTO webshop.user (name, lower_name, email, passwd, passwd_hash_algo) VALUES (?, ?, ?, ?, 'none')"
 
     // Query abschicken
     db.query(sql, [name, lower_name, email, passwd], (err, results) => {
         if (err) {
+            if (err.code === 'ER_DUP_ENTRY'){
+                res.status(409).json({message: 'Diese E-Mail Adresse ist bereits registriert.'})
+            }
             console.error('Fehler beim Schreiben in die Datenbank: ', err);
             res.status(500).send('Fehler beim Schreiben in die Datenbank');
             return;
@@ -150,7 +154,7 @@ app.post('/api/user/registration', (req, res) => {
 
 app.post('/api/user/login', (req, res) => {
     const {email, password} = req.body
-    const sql = 'SELECT * FROM user WHERE email = ?'
+    const sql = 'SELECT * FROM webshop.user WHERE email = ?'
 
     db.query(sql, [email], (err, results) => {
         if (err) {
@@ -276,7 +280,7 @@ app.get('/api/pruefe-artikel', (req, res) => {
         return res.status(400).json({ error: 'Keine Artikelnummer angegeben.' });
     }
 
-    const query = 'SELECT id FROM product WHERE id = ?';
+    const query = 'SELECT id FROM webshop.product WHERE id = ?';
 
     db.query(query, [artikelnummer], (err, results) => {
         if (err) {
