diff --git a/components/register.html b/components/register.html
index 014be3b..4a614a5 100644
--- a/components/register.html
+++ b/components/register.html
@@ -29,16 +29,6 @@
                 <input type="text" class="form-control" name="city" id="city" placeholder="Stadt" required>
             </div>
         </div>
-        <div class="row">
-            <div class="col-12">
-                <select name="country" id="country">
-                    <option disabled selected value="" style="display:none">Land</option>
-                    <option value="Frau">Österreich</option>
-                    <option value="Herr">Deutschland</option>
-                    <option value="Person">Schweiz</option>
-                </select>
-            </div>
-        </div>
         <div class="row">
             <div class="col-12">
                 <input type="email" class="form-control" name="email" id="email" placeholder="E-Mail" required>
diff --git a/db/datahandler.php b/db/datahandler.php
index 2ae0b56..49f6862 100644
--- a/db/datahandler.php
+++ b/db/datahandler.php
@@ -14,26 +14,22 @@ class DataHandler
         $firstname = testinput($data->firstname);
         $lastname = testinput($data->lastname);
         $street = testinput($data->street);
-        $streetnumber = testinput($data->streetnumber);
         $postalcode = testinput($data->postalcode);
-        $country = testinput($data->country);
         $role = "customer";
 
         $password = password_hash($password, PASSWORD_DEFAULT);
 
         require($_SERVER['DOCUMENT_ROOT'] . '/config/setupDBAccess.php');
         
-        $sql = "INSERT INTO `user` (`user_id`, `username`, `password`, `email`, `phone`, `salutation`, `firstname`, `lastname`, `role`, `created_at`) VALUES (?,?,?,?,?,?,?,?,?,?)";
-        $sql2 = "INSERT IGNORE INTO cities (postalcode, name) VALUES (?,?)";
-        $sql3 = "INSERT INTO address (street, streetnumber, postalcode, country) VALUES (?,?,?,?)";
+        $sql2 = "INSERT IGNORE INTO `cities` (`city_id`, `postalcode`, `name`) VALUES (?,?,?)";
+        $sql = "INSERT INTO `user` (`user_id`, `username`, `password`, `email`, `phone`, `salutation`, `firstname`, `lastname`, `address`, `plz`, `role`, `created_at`) VALUES (?,?,?,?,?,?,?,?,?,?,?,?)";
+        
 
         $stmtUser = $db->prepare($sql);
         $stmtCities = $db->prepare($sql2);
-        $stmtAddress = $db->prepare($sql3);
 
-        $stmtUser->bind_param("ssssssssss",null, $username, $password, $email, $phone, $salutation, $firstname, $lastname, $role, null);
-        $stmtCities->bind_param("ss", $postalcode, $country);
-        $stmtAddress->bind_param("ssss", $street, $streetnumber, $postalcode, $country);
+        $stmtUser->bind_param("ssssssssss", null, $username, $password, $email, $phone, $salutation, $firstname, $lastname, $street, $postalcode, $role, null);
+        $stmtCities->bind_param("sss", null, $postalcode, $coty);
 
         if ($stmtUser->execute() && $stmtCities->execute() && $stmtAddress->execute()) {
             return true;