diff -ubr ../birthdays~/birthdays.module ./birthdays.module
--- ../birthdays~/birthdays.module	2009-02-03 10:33:28 +0200
+++ ./birthdays.module	2009-06-02 10:59:58 +0300
@@ -712,7 +712,7 @@
         '</span>&nbsp;&nbsp;&nbsp;';
 
       // Show age (when allowed by user and administrator)
-      if (variable_get('birthdays_hide_year', BIRTHDAYS_HIDE_YEAR_NO) == BIRTHDAYS_HIDE_YEAR_NO || (variable_get('birthdays_hide_year', BIRTHDAYS_HIDE_YEAR_NO) == BIRTHDAYS_HIDE_YEAR_USER && $account->birthdays_user_hide_year != BIRTHDAYS_HIDE_YEAR_USER_YES)) {
+      if (variable_get('birthdays_hide_year', BIRTHDAYS_HIDE_YEAR_NO) == BIRTHDAYS_HIDE_YEAR_NO || (variable_get('birthdays_hide_year', BIRTHDAYS_HIDE_YEAR_NO) == BIRTHDAYS_HIDE_YEAR_USER && $account->{$_birthdays_field->name}['birthdays_user_hide_year'] != BIRTHDAYS_HIDE_YEAR_USER_YES)) {
         $age = '&nbsp;&nbsp;&nbsp;<span class="birthdays-age">('. $account->age .')</span>';
       }
 
@@ -744,7 +744,7 @@
       $form[$_birthdays_field->category][$_birthdays_field->name]['birthdays_user_hide_year'] = array(
         '#type' => 'checkbox',
         '#title' => t("Hide age and birth year"),
-        '#default_value' => (int) $account->birthdays_user_hide_year,
+        '#default_value' => (int) $account->{$_birthdays_field->name}['birthdays_user_hide_year'],
         '#description' => t("Do not show your age and your year of birth."),
         '#return_value' => BIRTHDAYS_HIDE_YEAR_USER_YES,
         '#weight' => 1,
@@ -982,8 +982,9 @@
  * @return int
  */
 function _birthdays_show_age($account) {
+  global $_birthdays_field;
   $age = NULL;
-  if (isset($account->age) && (variable_get('birthdays_hide_year', BIRTHDAYS_HIDE_YEAR_NO) == BIRTHDAYS_HIDE_YEAR_NO || (variable_get('birthdays_hide_year', BIRTHDAYS_HIDE_YEAR_NO) == BIRTHDAYS_HIDE_YEAR_USER && $account->birthdays_user_hide_year != BIRTHDAYS_HIDE_YEAR_USER_YES))) {
+  if (isset($account->age) && (variable_get('birthdays_hide_year', BIRTHDAYS_HIDE_YEAR_NO) == BIRTHDAYS_HIDE_YEAR_NO || (variable_get('birthdays_hide_year', BIRTHDAYS_HIDE_YEAR_NO) == BIRTHDAYS_HIDE_YEAR_USER && $account->{$_birthdays_field->name}['birthdays_user_hide_year'] != BIRTHDAYS_HIDE_YEAR_USER_YES))) {
     $age = $account->age;
   }
   return $age;
@@ -1010,6 +1011,7 @@
  * Format date, optionally hide year
  */
 function _birthdays_show_date_2($day, $month, $year, $account, $type = 'small') {
+  global $_birthdays_field;
   $output = '';
   // Determine format type
   switch ($type) {
@@ -1025,7 +1027,7 @@
   //$format = substr($format, 0, -6);
 
   // If admin or user decide to hide the age&year: hide year
-  if ($year && ( variable_get('birthdays_hide_year', BIRTHDAYS_HIDE_YEAR_NO) == BIRTHDAYS_HIDE_YEAR_YES || (variable_get('birthdays_hide_year', BIRTHDAYS_HIDE_YEAR_NO) == BIRTHDAYS_HIDE_YEAR_USER && $account->birthdays_user_hide_year == BIRTHDAYS_HIDE_YEAR_YES))) {
+  if ($year && ( variable_get('birthdays_hide_year', BIRTHDAYS_HIDE_YEAR_NO) == BIRTHDAYS_HIDE_YEAR_YES || (variable_get('birthdays_hide_year', BIRTHDAYS_HIDE_YEAR_NO) == BIRTHDAYS_HIDE_YEAR_USER && $account->{$_birthdays_field->name}['birthdays_user_hide_year'] == BIRTHDAYS_HIDE_YEAR_YES))) {
     $year = NULL;
   }
 
diff -ubr ../birthdays~/birthdays.page.inc ./birthdays.page.inc
--- ../birthdays~/birthdays.page.inc	2008-10-08 18:59:24 +0300
+++ ./birthdays.page.inc	2009-06-02 10:59:58 +0300
@@ -51,7 +51,7 @@
   while ($uid = db_fetch_object($result)) {
     // load the user objects
     $account = user_load(array('uid' => $uid->uid));
-    if (empty($filter_year) || !$account->birthdays_user_hide_year) {
+    if (empty($filter_year) || !$account->{$_birthdays_field->name}['birthdays_user_hide_year']) {
       $accounts[] = $account;
     }
   }