diff --git a/entity_translation.module b/entity_translation.module
index 7209884..c7b0463 100644
--- a/entity_translation.module
+++ b/entity_translation.module
@@ -118,9 +118,6 @@ function entity_translation_entity_info() {
         'class' => 'EntityTranslationUserHandler',
         'skip original values access' => TRUE,
         'skip shared fields access' => TRUE,
-        'default settings' => array(
-          'shared_fields_original_only' => TRUE,
-        ),
       ),
     ),
   );
@@ -1238,7 +1235,7 @@ function entity_translation_element_translatability_clue($element) {
   if (!isset($element['#attributes']['class'])) {
     $element['#attributes']['class'] = array();
   }
-  $element['#attributes']['class'][] = 'entity-translation-' . ($element['#multilingual'] ? 'field-translatable' : 'field-shared');
+  $element['#attributes']['class'][] = 'entity-translation-' . (!empty($element['#multilingual']) ? 'field-translatable' : 'field-shared');
 
   return $element;
 }
@@ -1316,8 +1313,12 @@ function entity_translation_form_alter(&$form, &$form_state) {
   if ($handler = entity_translation_entity_form_get_handler($form, $form_state)) {
     if (!$handler->isNewEntity()) {
       $handler->entityForm($form, $form_state);
-      // Hide shared form elements if the user is not allowed to edit them.
-      $handler->entityFormSharedElements($form);
+      $translations = $handler->getTranslations();
+      $form_langcode = $handler->getFormLanguage();
+      if (!isset($translations->data[$form_langcode]) || count($translations->data) > 1) {
+        // Hide shared form elements if the user is not allowed to edit them.
+        $handler->entityFormSharedElements($form);
+      }
     }
     else {
       $handler->entityFormLanguageWidget($form, $form_state);