diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
index 3cca5f69..aa12e9de 100644
--- a/docs/CHANGELOG.md
+++ b/docs/CHANGELOG.md
@@ -4,6 +4,7 @@ Changelog
 1.6.4 (Unreleased)
 -----------------------
 - Enh #502: Replace theme variables with CSS variables
+- Enh #504: Update Active Form for Bootstrap 5
 
 1.6.3 (August 23, 2024)
 -----------------------
diff --git a/views/config/menu.php b/views/config/menu.php
index ac12f332..35808e49 100644
--- a/views/config/menu.php
+++ b/views/config/menu.php
@@ -7,9 +7,9 @@
 
 use humhub\modules\calendar\models\MenuSettings;
 use humhub\modules\calendar\widgets\GlobalConfigMenu;
+use humhub\modules\ui\form\widgets\ActiveForm;
 use humhub\modules\ui\form\widgets\SortOrderField;
 use humhub\widgets\Button;
-use yii\widgets\ActiveForm;
 
 /* @var $model MenuSettings */
 ?>
@@ -30,4 +30,4 @@
         <?= Button::save()->submit() ?>
         <?php ActiveForm::end(); ?>
     </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/views/config/snippet.php b/views/config/snippet.php
index 1f042118..c6932fc6 100644
--- a/views/config/snippet.php
+++ b/views/config/snippet.php
@@ -9,9 +9,9 @@
 /* @var $model \humhub\modules\calendar\models\SnippetModuleSettings */
 
 use humhub\modules\calendar\widgets\GlobalConfigMenu;
+use humhub\modules\ui\form\widgets\ActiveForm;
 use humhub\modules\ui\form\widgets\SortOrderField;
 use humhub\widgets\Button;
-use yii\widgets\ActiveForm;
 ?>
 
 <div class="panel panel-default">
diff --git a/views/global/selectContainerModal.php b/views/global/selectContainerModal.php
index 96f16822..4559cf81 100644
--- a/views/global/selectContainerModal.php
+++ b/views/global/selectContainerModal.php
@@ -7,9 +7,9 @@
  */
 
 use humhub\libs\Html;
+use humhub\modules\ui\form\widgets\ActiveForm;
 use humhub\widgets\ModalButton;
 use humhub\widgets\ModalDialog;
-use yii\bootstrap\ActiveForm;
 
 /* @var $contentContainerSelection array */
 /* @var $submitUrl array */