diff --git a/website/queries/calcAge.php b/website/queries/calcAge.php
new file mode 100644
index 0000000..c2896b5
--- /dev/null
+++ b/website/queries/calcAge.php
@@ -0,0 +1,12 @@
+<?php
+/**
+ * calculates the age of a user
+ * @param string $bdayAsString
+ * @return int age
+ */
+function getAge(string $bdayAsString) : int {
+    $bday = new DateTime($bdayAsString);
+    $today = new DateTime("now");
+    $interval = $bday->diff($today);
+    return $interval->y;
+}
\ No newline at end of file
diff --git a/website/queries/settings.php b/website/queries/settings.php
index f4c5403..bdc9d38 100644
--- a/website/queries/settings.php
+++ b/website/queries/settings.php
@@ -110,20 +110,31 @@ function updateSettings() {
     WHERE
       `userID` = :userID
     ");
+    $bday = new DateTime();
+    $bday->setDate(test_input($_POST["year"]), test_input($_POST["month"]), test_input($_POST["day"]));
+    checkBday($bday);
 
     $stmt->bindValue(":fname", test_input($_POST["fname"]));
     $stmt->bindValue(":lname", test_input($_POST["lname"]));
     $stmt->bindValue(":location", test_input($_POST["location"]));
-    $stmt->bindValue(":bday", test_input($_POST["bday"]));
+    $stmt->bindValue(":bday", $bday->format("Ymd"));
     $stmt->bindValue(":bio", test_input($_POST["bio"]));
-    $stmt->bindValue(":showEmail", test_input($_POST["showEmail"]));
-    $stmt->bindValue(":showBday", test_input($_POST["showBday"]));
+    $stmt->bindValue(":showEmail", (array_key_exists("showEmail", $_POST) ? "1" : "0"));
+    $stmt->bindValue(":showBday", (array_key_exists("showBday", $_POST) ? "1" : "0"));
 
     $stmt->bindValue(":userID", $_SESSION["userID"]);
     $stmt->execute();
     throw new HappyAlert("Instellingen zijn opgeslagen.");
 }
 
+function checkBday(DateTime $bday) {
+    $today = new DateTime();
+    if ($bday >= $today) {
+        throw new AngryAlert("Jij bent vast niet in de toekomst geboren toch? ;)");
+    }
+}
+
+
 /**
  * Change
  * @throws AngryAlert
diff --git a/website/views/settings-view.php b/website/views/settings-view.php
index b6a3b4c..b7f554a 100644
--- a/website/views/settings-view.php
+++ b/website/views/settings-view.php
@@ -4,13 +4,11 @@ $settings = getSettings();
 
 <div class="content">
     <div class="settings">
-        <?php
-        if ($_SERVER["REQUEST_METHOD"] == "POST") {
-            echo "<div class='platform settings-message $alertClass '>
-            $alertMessage
-        </div>";
-        }
-        ?>
+        <?php if ($_SERVER["REQUEST_METHOD"] == "POST"): ?>
+        <div class='platform settings-message <?=$alertClass?>'>
+            <?=$alertMessage?>
+        </div>
+        <?php endif; ?>
         <form class="settings-profile platform" method="post">
             <h5>Profiel Instellingen</h5>
             <ul>
@@ -21,7 +19,7 @@ $settings = getSettings();
                            id="fname"
                            placeholder="Voornaam"
                            title="Voornaam"
-                           value="<?= $settings["fname"]?>"
+                           value="<?=$settings["fname"]?>"
                     >
                 </li>
                 <li>
@@ -30,7 +28,7 @@ $settings = getSettings();
                            name="lname"
                            id="lname"
                            placeholder="Achternaam"
-                           value="<?= $settings["lname"]?>"
+                           value="<?=$settings["lname"]?>"
                     >
                 </li>
                 <li>
@@ -39,43 +37,61 @@ $settings = getSettings();
                            name="location"
                            id="location"
                            placeholder="Locatie"
-                           value="<?= $settings["location"]?>"
+                           value="<?=$settings["location"]?>"
                     >
                 </li>
                 <li>
+                    <?php $currentbday = new DateTime($settings["birthdate"]); ?>
                     <label for="bday">Geboortedatum</label>
-                    <input type="date"
-                           name="bday"
-                           id="bday"
-                           placeholder="yyyy-mm-dd"
-                           value="<?= $settings["birthdate"]?>"
-                    >
+                    <select name='day' id="bday">
+                        <?php for ($day = 1; $day <= 31; $day++): ?>
+                        <option value='<?=$day?>'
+                                <?=($day == $currentbday->format("d")) ? "selected" : ""?>
+                        >
+                            <?=$day?>
+                        </option>
+                        <?php endfor; ?>
+                    </select>
+                    <select name='month' id="bday">
+                        <?php
+                        $months = array ("januari", "februari", "maart", "april", "mei", "juni", "juli", "augustus",
+                            "september", "oktober", "november", "december");
+                        for ($month = 1; $month <= 12; $month++):
+                        ?>
+                            <option value='<?=$month?>'
+                                    <?=($month == $currentbday->format("m")) ? "selected" : ""?>
+                            >
+                                <?=$months[$month - 1]?>
+                            </option>
+                        <?php endfor; ?>
+                    </select>
+                    <select name='year' id="bday">
+                        <?php
+                        $now = (new DateTime)->format("Y");
+                        for ($year = $now; $year >= 1900; $year--): ?>
+                        <option value='<?=$year?>'
+                                <?=($year == $currentbday->format("Y")) ? "selected" : ""?>
+                        >
+                            <?=$year?>
+                        </option>
+                        <?php endfor; ?>
+                    </select>
                 </li>
                 <li>
                     <label for="showBday">Toon leeftijd</label>
-                    <input type="radio"
+                    <input type="checkbox"
                            name="showBday"
-                           value="1"
-                           <?php echo ($settings["showBday"] ? "checked" : "")?>
-                    > Ja
-                    <input type="radio"
-                           name="showBday"
-                           value="0"
-                           <?php echo ($settings["showBday"] ? "" : "checked")?>
-                           > Nee
+                           id="showBday"
+                           <?=($settings["showBday"] ? "checked" : "")?>
+                    >
                 </li>
                 <li>
                     <label for="showEmail">Toon Email</label>
-                    <input type="radio"
+                    <input type="checkbox"
                            name="showEmail"
-                           value="1"
-                           <?php echo ($settings["showEmail"] ? "checked" : "")?>
-                    > Ja
-                    <input type="radio"
-                           name="showEmail"
-                           value="0"
-                        <?php echo ($settings["showEmail"] ? "" : "checked")?>
-                    > Nee
+                           id="showEmail"
+                           <?=($settings["showEmail"] ? "checked" : "")?>
+                    >
                 </li>
                 <li>
                     <label for="bio">Bio</label>
@@ -83,7 +99,7 @@ $settings = getSettings();
                               rows="5"
                               title="bio"
                               id="bio"
-                    ><?= $settings["bio"]?></textarea>
+                    ><?=$settings["bio"]?></textarea>
                 </li>
                 <li>
                     <label></label>
@@ -99,7 +115,7 @@ $settings = getSettings();
             <ul>
                 <li>
                     <label>Huidige profielfoto</label>
-                    <img src="<?= $settings["profilepicture"] ?>"
+                    <img src="<?=$settings["profilepicture"]?>"
                          class="profile-picture"
                     >
                 </li>
@@ -124,24 +140,30 @@ $settings = getSettings();
             <h5>Verander Wachtwoord</h5>
             <ul>
                 <li>
-                    <label>Oud wachtwoord</label>
+                    <label for="password-old">Oud wachtwoord</label>
                     <input type="password"
                            name="password-old"
+                           id="password-old"
                            placeholder="Oud wachtwoord"
+                           autocomplete="current-password"
                     >
                 </li>
                 <li>
-                    <label>Nieuw wachtwoord</label>
+                    <label for="password-new">Nieuw wachtwoord</label>
                     <input type="password"
                            name="password-new"
+                           id="password-new"
                            placeholder="Nieuw wachtwoord"
+                           autocomplete="new-password"
                     >
                 </li>
                 <li>
-                    <label>Bevestig wachtwoord</label>
+                    <label for="password-confirm">Bevestig wachtwoord</label>
                     <input type="password"
                            name="password-confirm"
+                           id="password-confirm"
                            placeholder="Bevestig wachtwoord"
+                           autocomplete="new-password"
                     >
                 </li>
                 <li>
@@ -160,7 +182,7 @@ $settings = getSettings();
                     <label for="email-old">Huidig Email </label>
                     <input type="email"
                            id="email-old"
-                           value="<?= $settings["email"]?>"
+                           value="<?=$settings["email"]?>"
                            disabled
                     >
                 </li>