diff --git a/frontend/src/components/TranslationFields.vue b/frontend/src/components/TranslationFields.vue
index 449df90..515cd96 100644
--- a/frontend/src/components/TranslationFields.vue
+++ b/frontend/src/components/TranslationFields.vue
@@ -18,9 +18,21 @@ const emit = defineEmits<{
   'update:translations': [value: TranslationMap];
 }>();
 
-const { t } = useI18n();
+const { locale, t } = useI18n();
+const fallbackLanguage: Language = { code: 'en', name: 'English', enabled: true, isDefault: true, sortOrder: 0 };
 const visibleLanguages = computed(() => props.languages.filter((language) => language.enabled));
-const defaultLanguage = computed(() => visibleLanguages.value.find((language) => language.isDefault) ?? visibleLanguages.value[0]);
+const defaultLanguage = computed(() => visibleLanguages.value.find((language) => language.isDefault) ?? visibleLanguages.value[0] ?? fallbackLanguage);
+const currentLanguage = computed(() => {
+  const currentLocale = String(locale.value || defaultLanguage.value.code);
+  return visibleLanguages.value.find((language) => language.code === currentLocale) ?? defaultLanguage.value;
+});
+const isDefaultLanguage = computed(() => currentLanguage.value.code === defaultLanguage.value.code);
+const currentValue = computed({
+  get: () => fieldValue(currentLanguage.value),
+  set: (value: string) => updateField(currentLanguage.value, value)
+});
+const currentPlaceholder = computed(() => fieldPlaceholder(currentLanguage.value));
+const currentRequired = computed(() => Boolean(props.required && (isDefaultLanguage.value || props.baseValue.trim() === '')));
 
 function fieldValue(language: Language): string {
   if (language.code === defaultLanguage.value?.code) {
@@ -58,23 +70,19 @@ function updateField(language: Language, value: string) {
   emit('update:translations', nextTranslations);
 }
 
-function inputValue(event: Event): string {
-  return event.target instanceof HTMLInputElement ? event.target.value : '';
-}
 </script>
 
 <template>
   <div class="translation-fields">
-    <div v-for="language in visibleLanguages" :key="language.code" class="field">
-      <label :for="`${idPrefix}-${language.code}`">
-        {{ t('common.fieldForLanguage', { field: label, language: language.name }) }}
+    <div class="field">
+      <label :for="`${idPrefix}-${currentLanguage.code}`">
+        {{ t('common.fieldForLanguage', { field: label, language: currentLanguage.name }) }}
       </label>
       <input
-        :id="`${idPrefix}-${language.code}`"
-        :value="fieldValue(language)"
-        :placeholder="fieldPlaceholder(language)"
-        :required="required && language.code === defaultLanguage?.code"
-        @input="updateField(language, inputValue($event))"
+        :id="`${idPrefix}-${currentLanguage.code}`"
+        v-model="currentValue"
+        :placeholder="currentPlaceholder"
+        :required="currentRequired"
       />
     </div>
   </div>
diff --git a/frontend/src/views/AdminView.vue b/frontend/src/views/AdminView.vue
index e20b522..13c07dc 100644
--- a/frontend/src/views/AdminView.vue
+++ b/frontend/src/views/AdminView.vue
@@ -248,6 +248,14 @@ function configBaseNameForSave() {
   return configForm.value.translations[currentConfigLocale.value]?.name ?? '';
 }
 
+function checklistTitleForSave() {
+  if (checklistForm.value.title.trim() !== '') {
+    return checklistForm.value.title;
+  }
+
+  return checklistForm.value.translations[currentConfigLocale.value]?.title ?? '';
+}
+
 function previewChecklistOrder(rows: DailyChecklistItem[]) {
   checklistRows.value = rows;
 }
@@ -391,7 +399,7 @@ async function loadChecklist() {
 async function saveChecklistItem() {
   await run(async () => {
     const payload = {
-      title: checklistForm.value.title,
+      title: checklistTitleForSave(),
       translations: checklistForm.value.translations
     };
 
diff --git a/frontend/src/views/HabitatEdit.vue b/frontend/src/views/HabitatEdit.vue
index 2cb5f98..8902475 100644
--- a/frontend/src/views/HabitatEdit.vue
+++ b/frontend/src/views/HabitatEdit.vue
@@ -30,7 +30,7 @@ type HabitatAppearanceForm = {
 
 const route = useRoute();
 const router = useRouter();
-const { t } = useI18n();
+const { locale, t } = useI18n();
 const options = ref<Options | null>(null);
 const itemRows = ref<Item[]>([]);
 const pokemonRows = ref<Pokemon[]>([]);
@@ -127,6 +127,15 @@ function closeEditor() {
   void router.push(cancelTo.value);
 }
 
+function habitatNameForSave() {
+  const baseName = habitatForm.value.name.trim();
+  if (baseName !== '') {
+    return habitatForm.value.name;
+  }
+
+  return habitatForm.value.translations[String(locale.value || '')]?.name ?? '';
+}
+
 async function loadEditor() {
   loading.value = true;
   message.value = '';
@@ -189,7 +198,7 @@ async function saveHabitat() {
 
   try {
     const payload: HabitatPayload = {
-      name: habitatForm.value.name,
+      name: habitatNameForSave(),
       translations: habitatForm.value.translations,
       recipeItems: toQuantityRows(habitatForm.value.recipeItems),
       pokemonAppearances: habitatForm.value.pokemonAppearances
diff --git a/frontend/src/views/ItemEdit.vue b/frontend/src/views/ItemEdit.vue
index 4f7980c..8a0f843 100644
--- a/frontend/src/views/ItemEdit.vue
+++ b/frontend/src/views/ItemEdit.vue
@@ -11,7 +11,7 @@ import { api, type ConfigType, type ItemPayload, type Language, type Options, ty
 
 const route = useRoute();
 const router = useRouter();
-const { t } = useI18n();
+const { locale, t } = useI18n();
 const options = ref<Options | null>(null);
 const languages = ref<Language[]>([]);
 const loading = ref(true);
@@ -53,6 +53,15 @@ function closeEditor() {
   void router.push(cancelTo.value);
 }
 
+function itemNameForSave() {
+  const baseName = itemForm.value.name.trim();
+  if (baseName !== '') {
+    return itemForm.value.name;
+  }
+
+  return itemForm.value.translations[String(locale.value || '')]?.name ?? '';
+}
+
 async function loadOptions() {
   const [loadedOptions, loadedLanguages] = await Promise.all([api.options(), api.languages()]);
   options.value = loadedOptions;
@@ -131,7 +140,7 @@ async function saveItem() {
 
   try {
     const payload: ItemPayload = {
-      name: itemForm.value.name,
+      name: itemNameForSave(),
       translations: itemForm.value.translations,
       categoryId: Number(itemForm.value.categoryId),
       usageId: itemForm.value.usageId ? Number(itemForm.value.usageId) : null,
diff --git a/frontend/src/views/PokemonEdit.vue b/frontend/src/views/PokemonEdit.vue
index ebe38f8..9a6a4db 100644
--- a/frontend/src/views/PokemonEdit.vue
+++ b/frontend/src/views/PokemonEdit.vue
@@ -16,7 +16,7 @@ type SkillItemDropForm = {
 
 const route = useRoute();
 const router = useRouter();
-const { t } = useI18n();
+const { locale, t } = useI18n();
 const options = ref<Options | null>(null);
 const itemOptions = ref<NamedEntity[]>([]);
 const languages = ref<Language[]>([]);
@@ -87,6 +87,15 @@ function skillDropLabel(skillId: string) {
   return name ? t('pages.pokemon.skillDrop', { name }) : t('pages.pokemon.dropItem');
 }
 
+function pokemonNameForSave() {
+  const baseName = pokemonForm.value.name.trim();
+  if (baseName !== '') {
+    return pokemonForm.value.name;
+  }
+
+  return pokemonForm.value.translations[String(locale.value || '')]?.name ?? '';
+}
+
 function closeEditor() {
   void router.push(cancelTo.value);
 }
@@ -164,7 +173,7 @@ async function savePokemon() {
   try {
     const payload: PokemonPayload = {
       id: Number(isEditing.value ? routeId.value : pokemonForm.value.id),
-      name: pokemonForm.value.name,
+      name: pokemonNameForSave(),
       translations: pokemonForm.value.translations,
       environmentId: Number(pokemonForm.value.environmentId),
       skillIds: toIds(pokemonForm.value.skillIds.slice(0, 2)),