diff --git a/app/public/edit_statistics.php b/app/public/edit_statistics.php
index 58221ea..e8e4a98 100644
--- a/app/public/edit_statistics.php
+++ b/app/public/edit_statistics.php
@@ -21,7 +21,11 @@
         }
 
         if (get_minutes($con, $m_id, $s_id)->fetch()['minutes'] != $minutes || get_seconds($con, $m_id, $s_id)->fetch()['seconds'] != $seconds || get_millis($con, $m_id, $s_id)->fetch()['millis'] != $millis) {
-            $time = "00:" . $minutes . ":" . $seconds . "." . $millis;
+            if ($millis < 10) {
+                $time = "00:" . $minutes . ":" . $seconds . "." . "0" . $millis;
+            } else {
+                $time = "00:" . $minutes . ":" . $seconds . "." . $millis;
+            }
             change_time($con, $m_id, $s_id, $time);
         }
 
@@ -48,7 +52,7 @@
                 <label for="seconds">Sekunden</label>
                 <input name="seconds" type="number" min="0" max="60" value=<?php if(!$time_set){echo"\"0\"";} else { echo "\"" . get_seconds($con, $row['m_id'], $row['s_id'])->fetch()['seconds'] . "\""; }?>/><br>
                 <label for="millis">Millisekunden</label>
-                <input name="millis" type="number" min="0" max="99" value=<?php if(!$time_set){echo"\"0\"";} else { echo "\"" . get_millis($con, $row['m_id'], $row['s_id'])->fetch()['millis'] . "\""; }?>/><br>
+                <input name="millis" type="number" min="0" max="99" value=<?php if(!$time_set){echo"\"0\"";} else { echo "\"" . get_millis($con, $row['m_id'], $row['s_id'])->fetch()['millis'] / 1e4 . "\""; }?>/><br>
             </div>
             <input type="hidden" name="m_id" value=<?php echo $row['m_id'] ?>/>
             <input type="hidden" name="s_id" value=<?php echo $row['s_id'] ?>/>
diff --git a/app/scripts/functions.php b/app/scripts/functions.php
index 686f86f..5ad2bac 100644
--- a/app/scripts/functions.php
+++ b/app/scripts/functions.php
@@ -106,7 +106,12 @@ function load_station_table($con, $s_id) {
         echo "<td>" . $row['Name'] . "</td>\n";
         echo "<td>" . $row['Feuerwehr'] . "</td>\n";
         echo "<td>" . $row['Punkte'] . "</td>\n";
-        echo "<td>" . $row["Zeit"] . "</td>\n";
+        if ($row['Zeit'] != NULL) {
+            $time = get_time_str($con, $row['m_id'], $s_id);
+            echo "<td>" . $time . "</td>\n";
+        } else {
+            echo "<td>" . $row['Zeit'] . "</td>\n";
+        }
         echo "</tr>\n";
     }
     echo "</tbody>\n";
@@ -158,4 +163,30 @@ function check_time($con, $m_id, $s_id) {
     } else {
         return true;
     }
+}
+
+function get_time_str($con, $m_id, $s_id) {
+    $minutes = get_minutes($con, $m_id, $s_id)->fetch()['minutes'];
+    $seconds = get_seconds($con, $m_id, $s_id)->fetch()['seconds'];
+    $millis = get_millis($con, $m_id, $s_id)->fetch()['millis'];
+    if ($minutes < 10) {
+        $time = "0" . $minutes;
+    } else {
+        $time = $minutes;
+    }
+
+    if ($seconds < 10) {
+        $time .= ":0" . $seconds;
+    } else {
+        $time .= ":" . $seconds;
+    }
+
+    $millis /= 10000;
+    
+    if ($millis < 10) {
+        $time .= ".0" . $millis;
+    } else {
+        $time .= "." . $millis;
+    }
+    return $time;
 }
\ No newline at end of file