diff --git a/public/manage/changelog.php b/public/manage/changelog.php
index 11b7df76..440fe394 100644
--- a/public/manage/changelog.php
+++ b/public/manage/changelog.php
@@ -156,12 +156,12 @@ switch ($_GET['v'] ?? null) {
                 $availableTags = $db->prepare('
                     SELECT `tag_id`, `tag_name`
                     FROM `msz_changelog_tags`
-                    WHERE `tag_id` NOT IN (
+                    WHERE `tag_archived` IS NULL
+                    AND `tag_id` NOT IN (
                         SELECT `tag_id`
                         FROM `msz_changelog_change_tags`
                         WHERE `change_id` = :change_id
                     )
-                    AND `tag_archived` IS NULL
                 ');
                 $availableTags->bindValue('change_id', $change['change_id']);
                 $availableTags = $availableTags->execute() ? $availableTags->fetchAll(PDO::FETCH_ASSOC) : [];
@@ -236,7 +236,8 @@ switch ($_GET['v'] ?? null) {
 
                 $updateTag->bindValue('name', $_POST['tag']['name']);
                 $updateTag->bindValue('description', $_POST['tag']['description']);
-                $updateTag->bindValue('archived', empty($_POST['tag']['description']) ? null : date('Y-m-d H:i:s'));
+                // this is fine, after being archived there shouldn't be any other changes being made
+                $updateTag->bindValue('archived', empty($_POST['tag']['archived']) ? null : date('Y-m-d H:i:s'));
                 $updateTag->execute();
 
                 if ($tagId < 1) {
diff --git a/views/manage/changelog/tag_edit.twig b/views/manage/changelog/tag_edit.twig
index ec620836..a59f7e4c 100644
--- a/views/manage/changelog/tag_edit.twig
+++ b/views/manage/changelog/tag_edit.twig
@@ -28,7 +28,7 @@
             <label class="form__label">
                 <div class="form__label__text">Archived</div>
                 <div class="form__label__input">
-                    <input class="input" type="checkbox" name="tag[archived]"{% if edit_role is defined and edit_role.tag_archived is not null %} checked{% endif %}>
+                    <input class="input" type="checkbox" name="tag[archived]"{% if edit_tag is defined and edit_tag.tag_archived is not null %} checked{% endif %}>
                 </div>
             </label>