diff --git a/index.js b/index.js
index ad4df5f..71040ad 100644
--- a/index.js
+++ b/index.js
@@ -39,10 +39,8 @@ function authNoRedirectHandler(req, res, next){
 
                 if(err) console.log(err);
                 let user = JSON.parse(JSON.stringify(result))[0]; // Parse user from database
-                console.log("Moin3")
                 try{
                     if(user.id){
-                        console.log("Moin4")
                         // Set user to req.user
                         req.isAdmin = user.isAdmin;
                         req.username = user.username;
@@ -54,7 +52,6 @@ function authNoRedirectHandler(req, res, next){
                     res.redirect('/logout')
                     return;
                 }
-                console.log("Moin5")
                 next(); // Continue to next handler
             });
         }
@@ -143,17 +140,25 @@ app.get("/account", authenticatedHandler, (req, res) => {
     FROM orders LEFT JOIN order_products ON orders.id=order_products.orderId
     LEFT JOIN products ON order_products.productId=products.id WHERE orders.userId = '${req.user}' ORDER BY orders.id DESC`, (err, result) => {
         if(err) console.log(err);
-        let dict = {
-            title: "Account",
-            user: req.user,
-            isAdmin: req.isAdmin,
-            username: req.username,
-            firstname: req.firstname,
-            lastname: req.lastname,
-            email: req.email,
-            orders: JSON.parse(JSON.stringify(result))
-        }
-        res.render('account', dict)
+        let orders = JSON.parse(JSON.stringify(result))
+
+        mysql_handler.con.query(`SELECT * FROM addresses LEFT JOIN cities ON addresses.cityId=cities.id WHERE addresses.userId=${req.user}`, (err, result) =>{
+            if(err) console.log(err);
+            
+            let dict = {
+                title: "Account",
+                user: req.user,
+                isAdmin: req.isAdmin,
+                username: req.username,
+                firstname: req.firstname,
+                lastname: req.lastname,
+                email: req.email,
+                orders: orders,
+                address: JSON.parse(JSON.stringify(result))[0],
+            }
+
+            res.render('account', dict)
+       });
     })
 });
 
diff --git a/mysql_handler.js b/mysql_handler.js
index c7cdcb9..cff1942 100644
--- a/mysql_handler.js
+++ b/mysql_handler.js
@@ -95,18 +95,21 @@ function createUser(username, email, password, firstname, lastname, gender, stre
             con.query(`INSERT INTO userinfos(firstname, lastname, gender, userId) VALUES ('${firstname}','${lastname}','${gender}',
             (SELECT id FROM users WHERE username='${username}' AND email='${email}'))`, (err, result) => {
                 if(err) console.log(err);
+                // Create City
+                con.query(`INSERT INTO cities(name, postcode) VALUES ('${cityName}', '${postcode}')`, (err, result) => {
+                    if(err) console.log(err);
+                 
+                    // Create Address
+                    con.query(`INSERT INTO addresses(street, housenumber, country, userId, cityId) VALUES ('${street}','${housenumber}','${country}',
+                    (SELECT id FROM users WHERE username='${username}'), (SELECT id FROM cities WHERE name='${cityName}' AND postcode='${postcode}' LIMIT 1))`, (err, result) => { 
+                        if(err) console.log(err);
+
+                    });
+                });
             });
             
-            // Create City
-            con.query(`INSERT INTO cities(name, postcode) VALUES ('${cityName}', '${postcode}')`, (err, result) => {
-                if(err) console.log(err);
-            });
-            
-            // Create Address
-            con.query(`INSERT INTO addresses(street, housenumber, country, userId, cityId) VALUES ('${street}','${housenumber}','${country}',
-            (SELECT id FROM users WHERE username='${username}'), (SELECT id FROM cities WHERE name='${cityName}' AND postcode='${postcode}'))`, (err, result) => { 
-                if(err) console.log(err);
-            });
+           
+           
             
             console.log(`User created: ${username}!`);
         }
diff --git a/views/account.ejs b/views/account.ejs
index 51b1c20..e3d7fcd 100644
--- a/views/account.ejs
+++ b/views/account.ejs
@@ -14,7 +14,7 @@
             <p><b>Nachname:</b> <%= lastname %></p>
             <p><b>Benutzername: </b><%= username %></p>
             <p><b>E-Mail: </b><%= email.substring(0,email.length/3) %><% for(var i = 0; i < email.length - email.length/4; i++){ %>*<% } %>
-            <p><b>Adresse: </b></p>
+            <p><b>Adresse: </b><%= address.street %> <%= address.housenumber %>, <%= address.postcode %> <%= address.name %>, <%= address.country %></p>
             </p>
         </div>