Index: units/languages/languages_item.php
===================================================================
--- units/languages/languages_item.php	(revision 15607)
+++ units/languages/languages_item.php	(working copy)
@@ -209,11 +209,11 @@
 
 				if (
 					!$this->Application->isAdmin && !defined('GW_NOTIFY') && preg_match('/[\/]{0,1}index.php[\/]{0,1}/', $_SERVER['PHP_SELF']) &&
-					$this->Application->HttpQuery->isEmptyUrl() && $this->Application->ConfigValue('UseContentLanguageNegotiation')
+					!$this->Application->HttpQuery->refererIsOurSite() && $this->Application->ConfigValue('UseContentLanguageNegotiation')
 				) {
 					$language_id = $this->processAcceptLanguage();
 
-					if ($language_id != $this->GetID()) {
+					if ( $language_id != $this->GetID() ) {
 						// redirect to same page with found language
 						$url_params = Array (
 							'm_cat_id' => 0, 'm_cat_page' => 1,