diff --git a/upload/includes/functions.php b/upload/includes/functions.php
index fa930c943..e41275f8c 100644
--- a/upload/includes/functions.php
+++ b/upload/includes/functions.php
@@ -1572,7 +1572,41 @@ function bb_date ($gmepoch, $format = false, $tz = null)
 	}
 	$date = gmdate($format, $gmepoch + (3600 * $tz));
 
-	return ($bb_cfg['translate_dates']) ? strtr(strtoupper($date), $lang['DATETIME']) : $date;
+	$thetime = ($bb_cfg['translate_dates']) ? strtr(strtoupper($date), $lang['DATETIME']) : $date;
+
+    $time_format = " H:i";
+
+    $date = getdate();
+    $today = $date['mday'];
+    $month = $date['mon'];
+    $year = $date['year'];
+
+    $forum_date_today = @gmdate ("d", $gmepoch + (3600 * $tz));
+    $forum_date_month = @gmdate ("m", $gmepoch + (3600 * $tz));
+    $forum_date_year = @gmdate ("Y", $gmepoch + (3600 * $tz));
+
+    if ($forum_date_today == $today && $forum_date_month == $month && $forum_date_year == $year)
+    {
+        $thetime = $lang['TODAY'] . @gmdate($time_format, $gmepoch + (3600 * $tz));
+    }
+    elseif ($today != 1 && $forum_date_today == ($today-1) && $forum_date_month == $month && $forum_date_year == $year)
+    {
+        $thetime = $lang['YESTERDAY'] . @gmdate($time_format, $gmepoch + (3600 * $tz));
+    }
+    elseif ($today == 1 && $month != 1)
+    {
+	    $yesterday = date ("t", mktime(0, 0, 0, ($month-1), 1, $year));
+	    if ($forum_date_today == $yesterday && $forum_date_month == ($month-1) && $forum_date_year == $year)
+	        $thetime = $lang['YESTERDAY'] . @gmdate($time_format, $gmepoch + (3600 * $tz));
+    }
+    elseif ($today == 1 && $month == 1)
+    {
+	    $yesterday = date ("t", mktime(0, 0, 0, 12, 1, ($year -1)));
+	    if ($forum_date_today == $yesterday && $forum_date_month == 12 && $forum_date_year == ($year-1))
+	        $thetime = $lang['YESTERDAY'] . @gmdate($time_format, $gmepoch + (3600 * $tz));
+    }
+
+    return ($thetime);
 }
 
 // Birthday
diff --git a/upload/includes/ucp/usercp_register.php b/upload/includes/ucp/usercp_register.php
index 44c046ddd..57eee8142 100644
--- a/upload/includes/ucp/usercp_register.php
+++ b/upload/includes/ucp/usercp_register.php
@@ -726,7 +726,7 @@ if($bb_cfg['birthday']['enabled'] && $mode != 'register')
 	}
 	$s_birthday .= build_select('b_md', $months, $b_md);
 
-	$year = bb_date(TIMENOW, 'Y');
+	$year = date('Y');
 	$years = array($lang['DELTA_TIME']['INTERVALS']['year'][0] => 0);
 	for($i=$year-$bb_cfg['birthday']['max_user_age']; $i<=$year-$bb_cfg['birthday']['min_user_age']; $i++)
 	{
diff --git a/upload/language/lang_english/lang_main.php b/upload/language/lang_english/lang_main.php
index f4abc2f53..a3265dedb 100644
--- a/upload/language/lang_english/lang_main.php
+++ b/upload/language/lang_english/lang_main.php
@@ -992,6 +992,9 @@ $lang['TZ']['11'] = 'GMT + 11 Hours';
 $lang['TZ']['12'] = 'GMT + 12 Hours';
 $lang['TZ']['13'] = 'GMT + 13 Hours';
 
+$lang['TODAY'] = 'Today';
+$lang['YESTERDAY'] = 'Yesterday';
+
 $lang['DATETIME']['SUNDAY'] = 'Sunday';
 $lang['DATETIME']['MONDAY'] = 'Monday';
 $lang['DATETIME']['TUESDAY'] = 'Tuesday';
diff --git a/upload/language/lang_russian/lang_main.php b/upload/language/lang_russian/lang_main.php
index 17d58f6f5..8e31290bd 100644
--- a/upload/language/lang_russian/lang_main.php
+++ b/upload/language/lang_russian/lang_main.php
@@ -999,6 +999,9 @@ $lang['TZ']['11'] = 'GMT + 11';
 $lang['TZ']['12'] = 'GMT + 12';
 $lang['TZ']['13'] = 'GMT + 13';
 
+$lang['TODAY'] = 'Сегодня';
+$lang['YESTERDAY'] = 'Вчера';
+
 $lang['DATETIME']['SUNDAY'] = 'Воскресенье';
 $lang['DATETIME']['MONDAY'] = 'Понедельник';
 $lang['DATETIME']['TUESDAY'] = 'Вторник';