diff --git a/resources/vue/components/I18nTextarea.vue b/resources/vue/components/I18nTextarea.vue
index 186c125e4912ce0544a9c8e6af4db55244ff7117..79a810dbf29250025d0e7d9ede275d9a8a38e1c9 100644
--- a/resources/vue/components/I18nTextarea.vue
+++ b/resources/vue/components/I18nTextarea.vue
@@ -17,7 +17,7 @@
                       v-bind="$attrs"
                       v-on="$listeners"
                       v-model="values[selectedLanguage.id]"
-                      :required="required && defaultLanguage === language.id"
+                      :required="required && defaultLanguage === selectedLanguage.id"
                       v-else-if="type === 'textarea'"></textarea>
             <studip-wysiwyg :name="nameOfInput(selectedLanguage.id)"
                             ref="inputfield"
diff --git a/templates/forms/i18n_formatted_input.php b/templates/forms/i18n_formatted_input.php
index f47d775755f35c0e5fb0dfab2ce4a585876f6144..4e667f5f2bf8f518157827ad867feddfae790ffd 100644
--- a/templates/forms/i18n_formatted_input.php
+++ b/templates/forms/i18n_formatted_input.php
@@ -7,7 +7,7 @@
             <span class="asterisk" title="<?= _('Dies ist ein Pflichtfeld') ?>" aria-hidden="true">*</span>
         <? endif ?>
     </label>
-    <i18n-textarea type="<?= \Config::get()->WYSIWYG ? 'wysiwyg' : 'textarea' ?>"
+    <i18n-textarea type="wysiwyg"
                    id="<?= $id ?>"
                    name="<?= htmlReady($name) ?>"
                    value="<?= htmlReady($value) ?>"