diff --git a/admin/judges_teams_projects.php b/admin/judges_teams_projects.php
index 4288bbf4..ad1b3b3a 100644
--- a/admin/judges_teams_projects.php
+++ b/admin/judges_teams_projects.php
@@ -286,10 +286,10 @@ if( ($action=="edit" || $action=="assign" ) && $edit)
 
 			echo "<nobr>";
 			if($show_date)
-				echo "$r->date ";
-			echo substr($r->starttime,0,-3);
+				echo format_date($r->date);
+			echo format_time($r->starttime);
 			echo " - ";
-			echo substr($r->endtime,0,-3);
+			echo format_time($r->endtime);
 			echo "</nobr>";
 			echo "</td><td>";
 			
@@ -391,11 +391,11 @@ if( ($action=="edit" || $action=="assign" ) && $edit)
 
 			echo "<nobr>";
 			if($show_date)
-				echo "$r->date ";
+				echo format_date($r->date);
 
-			echo substr($r->starttime,0,-3);
+			echo format_time($r->starttime);
 			echo " - ";
-			echo substr($r->endtime,0,-3);
+			echo format_time($r->endtime);
 			echo "</nobr>";
 			echo "</td><td>";
 
diff --git a/admin/judges_teams_timeslots.php b/admin/judges_teams_timeslots.php
index 88ed5823..f98219ef 100644
--- a/admin/judges_teams_timeslots.php
+++ b/admin/judges_teams_timeslots.php
@@ -152,9 +152,9 @@ function checkinvert(what)
 		while($rr = mysql_fetch_object($qq)) {
 			echo "<tr>";
 			echo "<td><input type=\"checkbox\" name=\"timeslots[]\" value=\"{$rr->id}\" /></td>";
-			if($show_date)	echo "<td>{$r->date}</td>";
-			echo "<td align=\"center\">".substr($rr->starttime,0,-3)."</td>";
-			echo "<td align=\"center\">".substr($rr->endtime,0,-3)."</td>";
+			if($show_date)	echo "<td>".format_date($r->date)."</td>";
+			echo "<td align=\"center\">".format_time($rr->starttime)."</td>";
+			echo "<td align=\"center\">".format_time($rr->endtime)."</td>";
 			echo "</tr>\n";
 		}
 	}
@@ -224,10 +224,10 @@ function checkinvert(what)
 		{
 			echo "<nobr>";
 			if($show_date)
-				echo "$r->date ";
-			echo substr($r->starttime,0,-3);
+				echo format_date($r->date);
+			echo format_time($r->starttime);
 			echo " - ";
-			echo substr($r->endtime,0,-3);
+			echo format_time($r->endtime);
 			echo "&nbsp;&nbsp;<a onclick=\"return confirmClick('Are you sure you want to remove this timeslot from the team?')\" href=\"judges_teams_timeslots.php?action=delete&delete=$r->id\"><img border=0 src=\"".$config['SFIABDIRECTORY']."/images/16/button_cancel.".$config['icon_extension']."\"></a>";
 			echo "</nobr>";
 			echo "<br />";
diff --git a/admin/judges_timeslots.php b/admin/judges_timeslots.php
index cd9cabbe..28de931e 100644
--- a/admin/judges_timeslots.php
+++ b/admin/judges_timeslots.php
@@ -359,11 +359,11 @@
 		$qq = mysql_query("SELECT * FROM judges_timeslots WHERE round_id='{$r->id}' ORDER BY `date`,`starttime`");
 		$c = mysql_num_rows($qq) +1;
 
-		echo "<td rowspan=\"$c\"><b>$r->date</b></td>";
-		echo "<td align=\"center\"><b>".substr($r->starttime,0,-3)."</b><br/>";
+		echo "<td rowspan=\"$c\"><b>".format_date($r->date)."</b></td>";
+		echo "<td align=\"center\"><b>".format_time($r->starttime)."</b><br/>";
 		
 		echo "</td>";
-		echo "<td align=\"center\"><b>".substr($r->endtime,0,-3)."</b></td>";
+		echo "<td align=\"center\"><b>".format_time($r->endtime)."</b></td>";
 		echo "<td align=\"center\"><b>{$r->name}  (".i18n($round_str[$r->type]).")</b></td>";
 		echo " <td align=\"center\">";
 		echo "<a href=\"judges_timeslots.php?action=editround&round_id={$r->id}\"><img border=\"0\" src=\"{$config['SFIABDIRECTORY']}/images/16/edit.{$config['icon_extension']}\"></a>";
@@ -379,8 +379,8 @@
 		while($rr = mysql_fetch_object($qq)) {
 			echo "<tr>";
 //			echo "<td></td>";
-			echo "<td align=\"right\">".substr($rr->starttime,0,-3)."</td>";
-			echo "<td align=\"right\">".substr($rr->endtime,0,-3)."</td>";
+			echo "<td align=\"right\">".format_time($rr->starttime)."</td>";
+			echo "<td align=\"right\">".format_time($rr->endtime)."</td>";
 			echo "<td align=\"center\">".i18n($round_str[$rr->type])."</td>";