diff --git a/docs/changelog/5.x.x.txt b/docs/changelog/5.x.x.txt
index 930cd5399..3f77d88d1 100644
--- a/docs/changelog/5.x.x.txt
+++ b/docs/changelog/5.x.x.txt
@@ -7,6 +7,8 @@
    deleted.
  - Fixed bug [ 843591 ] Fatal error while creating a new Message Board if
    there are no Forums yet.
+ - Fixed bug [ 844196 ] Time formats
+
 
 5.5.1
  - Fixed bug #829806 preventing users from updating thier passwords from the updateAccount form.
diff --git a/lib/WebGUI/DateTime.pm b/lib/WebGUI/DateTime.pm
index 556918681..772644809 100644
--- a/lib/WebGUI/DateTime.pm
+++ b/lib/WebGUI/DateTime.pm
@@ -258,10 +258,10 @@ sub epochToHuman {
 	$hour12 = $hour;
 	if ($hour12 > 12) {
 		$hour12 = $hour12 - 12;
-		if ($hour12 == 0) {
-			$hour12 = 12;
-		}
 	}	
+	if ($hour12 == 0) {
+		$hour12 = 12;
+	}
 	$value = sprintf("%02d",$hour12);
 	$output =~ s/\%h/$value/g;
 	$output =~ s/\%H/$hour12/g;