diff --git a/content/createArticle.php b/content/createArticle.php
index 7dd9274..072dfdb 100644
--- a/content/createArticle.php
+++ b/content/createArticle.php
@@ -31,45 +31,211 @@ if (!isset($_SESSION["user"])) {
         <div class="sidebar-block">
             <label for="category">Kategorie <span class="required">*</span></label>
             <select id="category" name="category" required>
-                <option value="" disabled selected>Kategorie wählen...</option>
+                <option disabled <?php
+                if ((!isset($_SESSION['old_category']) || empty($_SESSION['old_category'])) && (!isset($category) || empty($category))) {
+                    echo 'selected';
+                }
+                ?>>Kategorie wählen...</option>
 
                 <optgroup label="Sprachen">
-                    <option value="deutsch">Deutsch</option>
-                    <option value="englisch">Englisch</option>
-                    <option value="franzoesisch">Französisch</option>
-                    <option value="latein">Latein</option>
-                    <option value="literatur">Literatur</option>
+                    <option value="deutsch" <?php
+                    if (isset($_SESSION['old_category']) && !empty($_SESSION['old_category'])) {
+                        if ($_SESSION['old_category'] === 'deutsch') { echo 'selected'; }
+                    } elseif (isset($category) && !empty($category)) {
+                        if ($category === 'deutsch') { echo 'selected'; }
+                    }
+                    ?>>Deutsch</option>
+                    <option value="englisch" <?php
+                    if (isset($_SESSION['old_category']) && !empty($_SESSION['old_category'])) {
+                        if ($_SESSION['old_category'] === 'englisch') { echo 'selected'; }
+                    } elseif (isset($category) && !empty($category)) {
+                        if ($category === 'englisch') { echo 'selected'; }
+                    }
+                    ?>>Englisch</option>
+                    <option value="franzoesisch" <?php
+                    if (isset($_SESSION['old_category']) && !empty($_SESSION['old_category'])) {
+                        if ($_SESSION['old_category'] === 'franzoesisch') { echo 'selected'; }
+                    } elseif (isset($category) && !empty($category)) {
+                        if ($category === 'franzoesisch') { echo 'selected'; }
+                    }
+                    ?>>Französisch</option>
+                    <option value="latein" <?php
+                    if (isset($_SESSION['old_category']) && !empty($_SESSION['old_category'])) {
+                        if ($_SESSION['old_category'] === 'latein') { echo 'selected'; }
+                    } elseif (isset($category) && !empty($category)) {
+                        if ($category === 'latein') { echo 'selected'; }
+                    }
+                    ?>>Latein</option>
+                    <option value="literatur" <?php
+                    if (isset($_SESSION['old_category']) && !empty($_SESSION['old_category'])) {
+                        if ($_SESSION['old_category'] === 'literatur') { echo 'selected'; }
+                    } elseif (isset($category) && !empty($category)) {
+                        if ($category === 'literatur') { echo 'selected'; }
+                    }
+                    ?>>Literatur</option>
                 </optgroup>
 
                 <optgroup label="MINT">
-                    <option value="mathe">Mathematik</option>
-                    <option value="biologie">Biologie</option>
-                    <option value="chemie">Chemie</option>
-                    <option value="physik">Physik</option>
-                    <option value="informatik">Informatik</option>
-                    <option value="astronomie">Astronomie</option>
+                    <option value="mathe" <?php
+                    if (isset($_SESSION['old_category']) && !empty($_SESSION['old_category'])) {
+                        if ($_SESSION['old_category'] === 'mathe') { echo 'selected'; }
+                    } elseif (isset($category) && !empty($category)) {
+                        if ($category === 'mathe') { echo 'selected'; }
+                    }
+                    ?>>Mathematik</option>
+                    <option value="biologie" <?php
+                    if (isset($_SESSION['old_category']) && !empty($_SESSION['old_category'])) {
+                        if ($_SESSION['old_category'] === 'biologie') { echo 'selected'; }
+                    } elseif (isset($category) && !empty($category)) {
+                        if ($category === 'biologie') { echo 'selected'; }
+                    }
+                    ?>>Biologie</option>
+                    <option value="chemie" <?php
+                    if (isset($_SESSION['old_category']) && !empty($_SESSION['old_category'])) {
+                        if ($_SESSION['old_category'] === 'chemie') { echo 'selected'; }
+                    } elseif (isset($category) && !empty($category)) {
+                        if ($category === 'chemie') { echo 'selected'; }
+                    }
+                    ?>>Chemie</option>
+                    <option value="physik" <?php
+                    if (isset($_SESSION['old_category']) && !empty($_SESSION['old_category'])) {
+                        if ($_SESSION['old_category'] === 'physik') { echo 'selected'; }
+                    } elseif (isset($category) && !empty($category)) {
+                        if ($category === 'physik') { echo 'selected'; }
+                    }
+                    ?>>Physik</option>
+                    <option value="informatik" <?php
+                    if (isset($_SESSION['old_category']) && !empty($_SESSION['old_category'])) {
+                        if ($_SESSION['old_category'] === 'informatik') { echo 'selected'; }
+                    } elseif (isset($category) && !empty($category)) {
+                        if ($category === 'informatik') { echo 'selected'; }
+                    }
+                    ?>>Informatik</option>
+                    <option value="astronomie" <?php
+                    if (isset($_SESSION['old_category']) && !empty($_SESSION['old_category'])) {
+                        if ($_SESSION['old_category'] === 'astronomie') { echo 'selected'; }
+                    } elseif (isset($category) && !empty($category)) {
+                        if ($category === 'astronomie') { echo 'selected'; }
+                    }
+                    ?>>Astronomie</option>
                 </optgroup>
 
                 <optgroup label="Gesellschaft & Werte">
-                    <option value="geschichte">Geschichte</option>
-                    <option value="erdkunde">Erdkunde</option>
-                    <option value="sozialkunde">Sozialkunde</option>
-                    <option value="wirtschaft">Wirtschaftskunde</option>
-                    <option value="religion">Religion</option>
-                    <option value="ethik">Ethikunterricht</option>
-                    <option value="philosophie">Philosophie</option>
-                    <option value="psychologie">Psychologie</option>
-                    <option value="kunst">Kunst</option>
-                    <option value="musik">Musik</option>
-                    <option value="theater">Theater</option>
+                    <option value="geschichte" <?php
+                    if (isset($_SESSION['old_category']) && !empty($_SESSION['old_category'])) {
+                        if ($_SESSION['old_category'] === 'geschichte') { echo 'selected'; }
+                    } elseif (isset($category) && !empty($category)) {
+                        if ($category === 'geschichte') { echo 'selected'; }
+                    }
+                    ?>>Geschichte</option>
+                    <option value="erdkunde" <?php
+                    if (isset($_SESSION['old_category']) && !empty($_SESSION['old_category'])) {
+                        if ($_SESSION['old_category'] === 'erdkunde') { echo 'selected'; }
+                    } elseif (isset($category) && !empty($category)) {
+                        if ($category === 'erdkunde') { echo 'selected'; }
+                    }
+                    ?>>Erdkunde</option>
+                    <option value="sozialkunde" <?php
+                    if (isset($_SESSION['old_category']) && !empty($_SESSION['old_category'])) {
+                        if ($_SESSION['old_category'] === 'sozialkunde') { echo 'selected'; }
+                    } elseif (isset($category) && !empty($category)) {
+                        if ($category === 'sozialkunde') { echo 'selected'; }
+                    }
+                    ?>>Sozialkunde</option>
+                    <option value="wirtschaft" <?php
+                    if (isset($_SESSION['old_category']) && !empty($_SESSION['old_category'])) {
+                        if ($_SESSION['old_category'] === 'wirtschaft') { echo 'selected'; }
+                    } elseif (isset($category) && !empty($category)) {
+                        if ($category === 'wirtschaft') { echo 'selected'; }
+                    }
+                    ?>>Wirtschaftskunde</option>
+                    <option value="religion" <?php
+                    if (isset($_SESSION['old_category']) && !empty($_SESSION['old_category'])) {
+                        if ($_SESSION['old_category'] === 'religion') { echo 'selected'; }
+                    } elseif (isset($category) && !empty($category)) {
+                        if ($category === 'religion') { echo 'selected'; }
+                    }
+                    ?>>Religion</option>
+                    <option value="ethik" <?php
+                    if (isset($_SESSION['old_category']) && !empty($_SESSION['old_category'])) {
+                        if ($_SESSION['old_category'] === 'ethik') { echo 'selected'; }
+                    } elseif (isset($category) && !empty($category)) {
+                        if ($category === 'ethik') { echo 'selected'; }
+                    }
+                    ?>>Ethikunterricht</option>
+                    <option value="philosophie" <?php
+                    if (isset($_SESSION['old_category']) && !empty($_SESSION['old_category'])) {
+                        if ($_SESSION['old_category'] === 'philosophie') { echo 'selected'; }
+                    } elseif (isset($category) && !empty($category)) {
+                        if ($category === 'philosophie') { echo 'selected'; }
+                    }
+                    ?>>Philosophie</option>
+                    <option value="psychologie" <?php
+                    if (isset($_SESSION['old_category']) && !empty($_SESSION['old_category'])) {
+                        if ($_SESSION['old_category'] === 'psychologie') { echo 'selected'; }
+                    } elseif (isset($category) && !empty($category)) {
+                        if ($category === 'psychologie') { echo 'selected'; }
+                    }
+                    ?>>Psychologie</option>
+                    <option value="kunst" <?php
+                    if (isset($_SESSION['old_category']) && !empty($_SESSION['old_category'])) {
+                        if ($_SESSION['old_category'] === 'kunst') { echo 'selected'; }
+                    } elseif (isset($category) && !empty($category)) {
+                        if ($category === 'kunst') { echo 'selected'; }
+                    }
+                    ?>>Kunst</option>
+                    <option value="musik" <?php
+                    if (isset($_SESSION['old_category']) && !empty($_SESSION['old_category'])) {
+                        if ($_SESSION['old_category'] === 'musik') { echo 'selected'; }
+                    } elseif (isset($category) && !empty($category)) {
+                        if ($category === 'musik') { echo 'selected'; }
+                    }
+                    ?>>Musik</option>
+                    <option value="theater" <?php
+                    if (isset($_SESSION['old_category']) && !empty($_SESSION['old_category'])) {
+                        if ($_SESSION['old_category'] === 'theater') { echo 'selected'; }
+                    } elseif (isset($category) && !empty($category)) {
+                        if ($category === 'theater') { echo 'selected'; }
+                    }
+                    ?>>Theater</option>
                 </optgroup>
 
                 <optgroup label="Technik & Praxis">
-                    <option value="technik">Technik</option>
-                    <option value="werken">Werken</option>
-                    <option value="hauswirtschaft">Hauswirtschaft</option>
-                    <option value="sport">Sport</option>
+                    <option value="technik" <?php
+                    if (isset($_SESSION['old_category']) && !empty($_SESSION['old_category'])) {
+                        if ($_SESSION['old_category'] === 'technik') { echo 'selected'; }
+                    } elseif (isset($category) && !empty($category)) {
+                        if ($category === 'technik') { echo 'selected'; }
+                    }
+                    ?>>Technik</option>
+                    <option value="werken" <?php
+                    if (isset($_SESSION['old_category']) && !empty($_SESSION['old_category'])) {
+                        if ($_SESSION['old_category'] === 'werken') { echo 'selected'; }
+                    } elseif (isset($category) && !empty($category)) {
+                        if ($category === 'werken') { echo 'selected'; }
+                    }
+                    ?>>Werken</option>
+                    <option value="hauswirtschaft" <?php
+                    if (isset($_SESSION['old_category']) && !empty($_SESSION['old_category'])) {
+                        if ($_SESSION['old_category'] === 'hauswirtschaft') { echo 'selected'; }
+                    } elseif (isset($category) && !empty($category)) {
+                        if ($category === 'hauswirtschaft') { echo 'selected'; }
+                    }
+                    ?>>Hauswirtschaft</option>
+                    <option value="sport" <?php
+                    if (isset($_SESSION['old_category']) && !empty($_SESSION['old_category'])) {
+                        if ($_SESSION['old_category'] === 'sport') { echo 'selected'; }
+                    } elseif (isset($category) && !empty($category)) {
+                        if ($category === 'sport') { echo 'selected'; }
+                    }
+                    ?>>Sport</option>
                 </optgroup>
+
+                <?php
+                if (isset($_SESSION['old_category'])) {
+                    unset($_SESSION['old_category']);
+                }
+                ?>
             </select>
         </div>