diff --git a/src/main/resources/templates/PaceForm.html b/src/main/resources/templates/PaceForm.html
index 11a1861a..31b47a7a 100644
--- a/src/main/resources/templates/PaceForm.html
+++ b/src/main/resources/templates/PaceForm.html
@@ -89,8 +89,9 @@ <h5 class="card-title">Pace</h5>
                         for travelling <span th:text="${form.major}">30</span> <span
                             th:text="${form.distanceMajorUnit}">kilometer</span> and
                         <span th:text="${form.minor}">0</span> <span th:text="${form.distanceMinorUnit}">meter</span> in
-                        <span th:text="${form.hour}">1</span> hour, <span th:text="${form.minute}">0</span> minute and
-                        <span th:text="${form.second}">0</span> seconds.
+                        <span th:text="${form.hour}">1</span> hour(s), <span th:text="${form.minute}">0</span> minute(s)
+                        and
+                        <span th:text="${form.second}">0</span> second(s).
                     </p>
                 </div>
             </div>
diff --git a/src/main/resources/templates/SpeedForm.html b/src/main/resources/templates/SpeedForm.html
index 89cc89d3..8c0d68ff 100644
--- a/src/main/resources/templates/SpeedForm.html
+++ b/src/main/resources/templates/SpeedForm.html
@@ -89,8 +89,8 @@ <h5 class="card-title">Speed</h5>
                         for travelling <span th:text="${form.major}">30</span> <span
                             th:text="${form.distanceMajorUnit}">kilometer</span> and <span
                             th:text="${form.minor}">0</span> <span th:text="${form.distanceMinorUnit}">meter</span> in
-                        <span th:text="${form.hour}">1</span> hour, <span th:text="${form.minute}">0</span> minute
-                        <span th:text="${form.second}">0</span> seconds.
+                        <span th:text="${form.hour}">1</span> hour(s), <span th:text="${form.minute}">0</span> minute(s)
+                        <span th:text="${form.second}">0</span> second(s).
                     </p>
                 </div>
             </div>