diff --git a/src/bundle/Resources/translations/ibexa_user_settings.en.xliff b/src/bundle/Resources/translations/ibexa_user_settings.en.xliff
index b39eac5b81..1b41e24fec 100644
--- a/src/bundle/Resources/translations/ibexa_user_settings.en.xliff
+++ b/src/bundle/Resources/translations/ibexa_user_settings.en.xliff
@@ -32,13 +32,13 @@
         <note>key: settings.autosave.value.description</note>
       </trans-unit>
       <trans-unit id="8d3d9c3a593c29c5ad69cf09b44cc423b27b1b64" resname="settings.autosave.value.disabled">
-        <source>disabled</source>
-        <target state="new">disabled</target>
+        <source>Disabled</source>
+        <target state="new">Disabled</target>
         <note>key: settings.autosave.value.disabled</note>
       </trans-unit>
       <trans-unit id="5f85d72d00abca8e47ea83a67c9577c3cdb454b8" resname="settings.autosave.value.enabled">
-        <source>enabled</source>
-        <target state="new">enabled</target>
+        <source>Enabled</source>
+        <target state="new">Enabled</target>
         <note>key: settings.autosave.value.enabled</note>
       </trans-unit>
       <trans-unit id="6e582329e8e54377b58d547389fda8ac2dd2cf5c" resname="settings.autosave.value.title">
@@ -72,13 +72,13 @@
         <note>key: settings.in_context_translation.value.description</note>
       </trans-unit>
       <trans-unit id="3f33c08a95b774bfdcb67ade54bce7f62bd2ac54" resname="settings.in_context_translation.value.disabled">
-        <source>disabled</source>
-        <target state="new">disabled</target>
+        <source>Disabled</source>
+        <target state="new">Disabled</target>
         <note>key: settings.in_context_translation.value.disabled</note>
       </trans-unit>
       <trans-unit id="08e33cb64156307a5a8197a0cdb4e254e6c4c5c5" resname="settings.in_context_translation.value.enabled">
-        <source>enabled</source>
-        <target state="new">enabled</target>
+        <source>Enabled</source>
+        <target state="new">Enabled</target>
         <note>key: settings.in_context_translation.value.enabled</note>
       </trans-unit>
       <trans-unit id="655baeb177f1234a01684cf79c22ccdcaf5bee51" resname="settings.in_context_translation.value.title">
diff --git a/src/bundle/Resources/views/themes/admin/ui/component/details/details.html.twig b/src/bundle/Resources/views/themes/admin/ui/component/details/details.html.twig
index 6f619d0771..a8c4d434c5 100644
--- a/src/bundle/Resources/views/themes/admin/ui/component/details/details.html.twig
+++ b/src/bundle/Resources/views/themes/admin/ui/component/details/details.html.twig
@@ -36,12 +36,18 @@
                     {% set is_field_empty = item.is_field_empty|default(false) %}
 
                     <div 
-                        class="ibexa-details__item {{ item_inline|default(false) ? 'ibexa-details__item--inline' ~ 
+                        class="ibexa-details__item {{ item_inline|default(false) ? 'ibexa-details__item--inline' ~
                         (is_field_empty ? ' ibexa-details__item--hidden') }}"
                     >
                         <div class="ibexa-details__item-label {{ item_inline|default(false) ? '' : 'ibexa-label' }}">{{ item.label }}</div>
                         <div class="ibexa-details__item-content">
-                            {{ item.content_raw is defined ? item.content_raw|raw : item.content }}
+                            {% if item.content_raw is defined %}
+                                {{ item.content_raw|raw }}
+                            {% elseif item.content == 'undefined' %}
+                                -
+                            {% else %}
+                                {{ item.content }}
+                            {% endif %}
                         </div>
                     </div>
                 {% endif %}
diff --git a/src/lib/Behat/Page/UserSettingsPage.php b/src/lib/Behat/Page/UserSettingsPage.php
index 9a13a73328..f8516f18ea 100644
--- a/src/lib/Behat/Page/UserSettingsPage.php
+++ b/src/lib/Behat/Page/UserSettingsPage.php
@@ -82,7 +82,7 @@ public function disableAutosave(): void
     {
         $this->contentActionsMenu->verifyIsLoaded();
         $this->getHTMLPage()->find($this->getLocator('autosaveDraftValueDropdown'))->click();
-        $this->ibexaDropdown->selectOption('disabled');
+        $this->ibexaDropdown->selectOption('Disabled');
     }
 
     protected function getRoute(): string
diff --git a/src/lib/UserSetting/Autosave.php b/src/lib/UserSetting/Autosave.php
index 7b44a9ed68..77500d45b8 100644
--- a/src/lib/UserSetting/Autosave.php
+++ b/src/lib/UserSetting/Autosave.php
@@ -112,7 +112,7 @@ private function getTranslatedDescription(): string
     private function getTranslatedOptionEnabled(): string
     {
         return $this->translator->trans(
-            /** @Desc("enabled") */
+            /** @Desc("Enabled") */
             'settings.autosave.value.enabled',
             [],
             'ibexa_user_settings'
@@ -122,7 +122,7 @@ private function getTranslatedOptionEnabled(): string
     private function getTranslatedOptionDisabled(): string
     {
         return $this->translator->trans(
-            /** @Desc("disabled") */
+            /** @Desc("Disabled") */
             'settings.autosave.value.disabled',
             [],
             'ibexa_user_settings'
diff --git a/src/lib/UserSetting/InContextTranslation.php b/src/lib/UserSetting/InContextTranslation.php
index 8e36b9a722..8567141e6f 100644
--- a/src/lib/UserSetting/InContextTranslation.php
+++ b/src/lib/UserSetting/InContextTranslation.php
@@ -103,7 +103,7 @@ private function getTranslatedDescription(): string
     private function getTranslatedOptionEnabled(): string
     {
         return $this->translator->trans(
-            /** @Desc("enabled") */
+            /** @Desc("Enabled") */
             'settings.in_context_translation.value.enabled',
             [],
             'ibexa_user_settings'
@@ -113,7 +113,7 @@ private function getTranslatedOptionEnabled(): string
     private function getTranslatedOptionDisabled(): string
     {
         return $this->translator->trans(
-            /** @Desc("disabled") */
+            /** @Desc("Disabled") */
             'settings.in_context_translation.value.disabled',
             [],
             'ibexa_user_settings'