diff --git a/entity_translation.install b/entity_translation.install
index d973b1d..3c75078 100644
--- a/entity_translation.install
+++ b/entity_translation.install
@@ -114,8 +114,8 @@ function _entity_translation_grant_original_values_permissions() {
   }
 
   // Comments.
-  $permissions['comment'][] = 'administer comments';
   if (module_exists('comment')) {
+    $permissions['comment'][] = 'administer comments';
     $permissions['comment'][] = 'edit own comments';
   }
 
diff --git a/includes/translation.handler.inc b/includes/translation.handler.inc
index aad7ea8..a2dc998 100644
--- a/includes/translation.handler.inc
+++ b/includes/translation.handler.inc
@@ -662,10 +662,7 @@ class EntityTranslationDefaultHandler implements EntityTranslationHandlerInterfa
    * @see EntityTranslationHandlerInterface::getTranslationAccess()
    */
   public function getTranslationAccess($langcode) {
-    if (!empty($this->entityInfo['translation']['entity_translation']['skip original values access'])) {
-      return TRUE;
-    }
-    return $langcode != $this->getLanguage() || user_access('edit original values') || user_access("edit {$this->entityType} original values");
+    return !empty($this->entityInfo['translation']['entity_translation']['skip original values access']) || $langcode != $this->getLanguage() || user_access('edit original values') || user_access("edit {$this->entityType} original values");
   }
 
   /**