diff --git a/upload/includes/functions.php b/upload/includes/functions.php
index a27dd21e9..159014289 100644
--- a/upload/includes/functions.php
+++ b/upload/includes/functions.php
@@ -1692,10 +1692,10 @@ function realdate($date, $format = "Ymd")
 	return bb_date($date*86400+1, $format, 0);
 }
 
-function birthday_age($date)
+function birthday_age($date, $list = 0)
 {
 	if(!$date) return;
-	return delta_time(mktime(11, 0, 0, realdate($date, 'm'), realdate($date, 'd'), realdate($date, 'Y')));
+	return delta_time(mktime(11, 0, 0, realdate($date, 'm'), realdate($date, 'd'), (realdate($date, 'Y') - $list)));
 }
 
 //
diff --git a/upload/index.php b/upload/index.php
index 3af5745f5..693bf646b 100644
--- a/upload/index.php
+++ b/upload/index.php
@@ -341,27 +341,29 @@ if($bb_cfg['birthday']['check_day'] && $bb_cfg['birthday']['enabled'])
 {
 	$this_year = bb_date(TIMENOW, 'Y', '', false);
 	$date_today = bb_date(TIMENOW, 'Ymd', '', false);
-	$date_forward = bb_date(TIMENOW+($bb_cfg['birthday']['check_day']*86400), 'Ymd', '', false);
+	$date_forward = bb_date(TIMENOW + ($bb_cfg['birthday']['check_day']*86400), 'Ymd', '', false);
 
-	$birthday_today_list =  $birthday_week_list = array();
+	$birthday_today_list = $birthday_week_list = array();
 
 	foreach ($stats['birthday'] as $birthdayrow)
 	{
-	    $user_birthday2 = $this_year . ($user_birthday = realdate("md", $birthdayrow['user_birthday']));
+		$user_birthday = realdate($birthdayrow['user_birthday'], 'md');
+	    $user_birthday2 = $this_year . $user_birthday;
 
         if ($user_birthday2 < $date_today) $user_birthday2 += 10000;
 
 		if ($user_birthday2 > $date_today  && $user_birthday2 <= $date_forward)
 		{
 			// user are having birthday within the next days
-			$birthday_week_list[] = '<a href="'. PROFILE_URL . $birthdayrow['user_id'] .'">'. wbr($birthdayrow['username']) .'</a> <span class="small">('. birthday_age($birthdayrow['user_birthday']) .')</span>';
+			$birthday_week_list[] = '<a href="'. PROFILE_URL . $birthdayrow['user_id'] .'">'. wbr($birthdayrow['username']) .'</a> <span class="small">('. birthday_age($birthdayrow['user_birthday'], 1) .')</span>';
 		}
 		elseif ($user_birthday2 == $date_today)
      	{
 			//user have birthday today
-			$birthday_today_list[] = '<a href="'. PROFILE_URL . $birthdayrow['user_id'] .'">'. wbr($birthdayrow['username']) .'</a> <span class="small">('. birthday_age($birthdayrow['user_birthday']) .')</span>';
+			$birthday_today_list[] = '<a href="'. PROFILE_URL . $birthdayrow['user_id'] .'">'. wbr($birthdayrow['username']) .'</a> <span class="small">('. birthday_age($birthdayrow['user_birthday'], 1) .')</span>';
         }
 	}
+
 	$birthday_today_list = ($birthday_today_list) ? $lang['BIRTHDAY_TODAY'] . join(', ', $birthday_today_list) : $lang['NOBIRTHDAY_TODAY'];
 	$birthday_week_list = ($birthday_week_list) ? sprintf($lang['BIRTHDAY_WEEK'], $bb_cfg['birthday']['check_day'], join(', ', $birthday_week_list)) : sprintf($lang['NOBIRTHDAY_WEEK'], $bb_cfg['birthday']['check_day']);