Index: pathauto.module
===================================================================
--- pathauto.module	(revision 4806)
+++ pathauto.module	(working copy)
@@ -410,7 +410,7 @@
   if (function_exists('entity_language')) {
     $langcode = entity_language($entity_type, $entity);
   }
-  elseif ($check_language_property && !empty($entity->language)) {
+  if ($check_language_property && (empty($langcode)) && !empty($entity->language)) {
     $langcode = $entity->language;
   }