diff --git a/includes/salsa_entity.mock.inc b/includes/salsa_entity.mock.inc
index 2e5dfa7..2cbe364 100644
--- a/includes/salsa_entity.mock.inc
+++ b/includes/salsa_entity.mock.inc
@@ -87,6 +87,81 @@ class SalsaAPIMock extends SalsaAPI implements SalsaAPIInterface {
 </data>
 EOF;
     }
+    elseif (($query[0] == 'object=supporter') && isset($query[1]) &&
+      (($query[1] == 'condition=supporter_KEY=2'))) {
+      $response = <<<EOF
+<?xml version="1.0"?>
+  <data organization_KEY="11111">
+    <supporter>
+      <item>
+        <supporter_KEY>2</supporter_KEY>
+        <organization_KEY>11111</organization_KEY>
+        <chapter_KEY/>
+        <Last_Modified>Mon May 21 2012 11:56:46 GMT-0400 (EDT)</Last_Modified>
+        <Date_Created>Mon May 20 2012 16:48:23 GMT-0400 (EDT)</Date_Created>
+        <Title>Mr</Title>
+        <First_Name>First Name</First_Name>
+        <MI/>
+        <Last_Name>Last Name</Last_Name>
+        <Suffix/>
+        <Email>example@example.com</Email>
+        <Password>d41d8cd98f00b204e9800998ecf8427e</Password>
+        <Receive_Email>1</Receive_Email>
+        <Email_Status/>
+        <Email_Preference/>
+        <Soft_Bounce_Count>0</Soft_Bounce_Count>
+        <Hard_Bounce_Count>0</Hard_Bounce_Count>
+        <Last_Bounce/>
+        <Receive_Phone_Blasts_BOOLVALUE>false</Receive_Phone_Blasts_BOOLVALUE>
+        <Receive_Phone_Blasts>false</Receive_Phone_Blasts>
+        <Phone/>
+        <Cell_Phone/>
+        <Phone_Provider/>
+        <Work_Phone/>
+        <Pager/>
+        <Home_Fax/>
+        <Work_Fax/>
+        <Street>Example Street</Street>
+        <Street_2/>
+        <Street_3/>
+        <City>Example City</City>
+        <State/>
+        <Zip>1000</Zip>
+        <PRIVATE_Zip_Plus_4>0000</PRIVATE_Zip_Plus_4>
+        <County/>
+        <District/>
+        <Country>CH</Country>
+        <Latitude>0.000000</Latitude>
+        <Longitude>0.000000</Longitude>
+        <Organization/>
+        <Department/>
+        <Occupation/>
+        <Instant_Messenger_Service/>
+        <Instant_Messenger_Name/>
+        <Web_Page/>
+        <Alternative_Email/>
+        <Other_Data_1/>
+        <Other_Data_2/>
+        <Other_Data_3/>
+        <Notes/>
+        <Source>Web</Source>
+        <Source_Details>(No Referring info)</Source_Details>
+        <Source_Tracking_Code>(No Original Source Available)</Source_Tracking_Code>
+        <Tracking_Code/>
+        <Status/>
+        <Timezone/>
+        <Language_Code>eng</Language_Code>
+        <uid/>
+        <custom_field_1/>
+        <custom_field_2/>
+        <key>2</key>
+        <object>supporter</object>
+      </item>
+      <count>1</count>
+  </supporter>
+</data>
+EOF;
+    }
     elseif ($script == '/api/getObjects.sjs' && $query[0] == 'object=signup_page') {
       $response = <<<EOF
 <?xml version="1.0"?>
diff --git a/salsa_entity.module b/salsa_entity.module
index 4b52212..f6b1826 100644
--- a/salsa_entity.module
+++ b/salsa_entity.module
@@ -237,8 +237,8 @@ function salsa_entity_salsa_object_type_info() {
  * Necessary to set the language property on supporter objects upon saving and
  * updating.
  */
-function salsa_entity_entity_presave($entity, $type) {
-  if ($type == 'salsa_supporter' && variable_get('salsa_entity_set_supporter_language', TRUE)) {
+function salsa_entity_salsa_supporter_presave($entity) {
+  if (variable_get('salsa_entity_set_supporter_language', TRUE)) {
     // Set the code only for supporters that don't have any language code yet.
     if (empty($entity->Language_Code)) {
       $lang_code = SalsaEntityLanguageMapper::toIso639_2();
diff --git a/tests/salsa_entity.test b/tests/salsa_entity.test
index 89d38e1..721a0f1 100644
--- a/tests/salsa_entity.test
+++ b/tests/salsa_entity.test
@@ -75,7 +75,7 @@ class SalsaEntityTranslationTestCase extends SalsaEntityBaseTestCase {
   }
 
   public function setUp() {
-    parent::setUp(array('salsa_event'));
+    parent::setUp(array('salsa_event', 'locale', 'salsa_entity'));
   }
 
   /**
@@ -105,4 +105,50 @@ class SalsaEntityTranslationTestCase extends SalsaEntityBaseTestCase {
     $this->assertEqual($event2->getTranslation('Event_Name',  'de'), $event2->Event_Name);
   }
 
+  /**
+   * Check whether language is saved proper on supporter objects.
+   */
+  function testSupporterLanguageStorage() {
+    global $language;
+    $language = (object) array(
+      'language' => 'de',
+      'name' => 'German',
+      'native' => 'Deutsch',
+      'direction' => 0,
+      'enabled' => 1,
+      'plurals' => 0,
+      'formula' => '',
+      'domain' => '',
+      'prefix' => '',
+      'weight' => 0,
+      'javascript' => '',
+    );
+    $supporter_id = 1;
+
+    // Disable language storage on supporter objects and make sure the language
+    // code isn't saved.
+    variable_set('salsa_entity_set_supporter_language', FALSE);
+    $supporter = entity_load_single('salsa_supporter', $supporter_id);
+    $supporter->save();
+    $mock = variable_get('salsa_entity_mock_saved');
+    $this->assertTrue(empty($mock['supporter'][$supporter_id]['Language_Code']));
+
+    // Now enable language storage on supporter objects and test if the language
+    // code gets saved.
+    variable_set('salsa_entity_set_supporter_language', TRUE);
+    $supporter = entity_load_single('salsa_supporter', $supporter_id);
+    $supporter->save();
+    $mock = variable_get('salsa_entity_mock_saved');
+    $this->assertEqual($mock['supporter'][$supporter_id]['Language_Code'], SalsaEntityLanguageMapper::toIso639_2($language->language));
+
+    // Load a supporter that already has a language code set to "eng" and test
+    // that the language code doesn't get overridden with "ger", the current
+    // language.
+    $supporter_id = 2;
+    $supporter = entity_load_single('salsa_supporter', $supporter_id);
+    $supporter->save();
+    $mock = variable_get('salsa_entity_mock_saved');
+    $this->assertEqual($supporter->Language_Code, $mock['supporter'][$supporter_id]['Language_Code']);
+  }
+
 }