diff --git a/src/psm/Module/Config/Controller/ConfigController.php b/src/psm/Module/Config/Controller/ConfigController.php
index 01216e2a..08786e60 100644
--- a/src/psm/Module/Config/Controller/ConfigController.php
+++ b/src/psm/Module/Config/Controller/ConfigController.php
@@ -508,7 +508,7 @@ class ConfigController extends AbstractController
             'label_alert_proxy_url' => psm_get_lang('config', 'alert_proxy_url'),
             'label_auto_refresh' => psm_get_lang('config', 'auto_refresh'),
             'label_auto_refresh_description' => psm_get_lang('config', 'auto_refresh_description'),
-            'label_seconds' => psm_get_lang('config', 'seconds'),
+            'label_seconds' => psm_get_lang('system', 'seconds'),
             'label_save' => psm_get_lang('system', 'save'),
             'label_test' => psm_get_lang('config', 'test'),
             'label_log_retention_period' => psm_get_lang('config', 'log_retention_period'),
diff --git a/src/psm/Module/Server/Controller/ServerController.php b/src/psm/Module/Server/Controller/ServerController.php
index 68769138..c315e8bf 100644
--- a/src/psm/Module/Server/Controller/ServerController.php
+++ b/src/psm/Module/Server/Controller/ServerController.php
@@ -597,7 +597,8 @@ class ServerController extends AbstractServerController
             'label_yes' => psm_get_lang('system', 'yes'),
             'label_no' => psm_get_lang('system', 'no'),
             'label_add_new' => psm_get_lang('system', 'add_new'),
-            'label_milliseconds' => psm_get_lang('config', 'milliseconds'),
+            'label_seconds' => psm_get_lang('system', 'seconds'),
+            'label_milliseconds' => psm_get_lang('system', 'milliseconds'),
             'label_online' => psm_get_lang('servers', 'online'),
             'label_offline' => psm_get_lang('servers', 'offline'),
             'label_ok' => psm_get_lang('system', 'ok'),
diff --git a/src/templates/default/module/server/history.tpl.html b/src/templates/default/module/server/history.tpl.html
index 7f76bc69..70d70872 100644
--- a/src/templates/default/module/server/history.tpl.html
+++ b/src/templates/default/module/server/history.tpl.html
@@ -30,7 +30,7 @@
 		data: {
 			datasets: [
 			{
-				data: [{{ graph.lines.offline.value }}],
+				data: [{{ graph.lines.offline.value * 1000 }}],
 				label: '{{ graph.lines.offline.name }}',
 				backgroundColor: '#dc3545',
 				borderColor: '#dc3545',
@@ -41,7 +41,7 @@
 				spanGaps: false,
 			},
 			{
-				data: [{{ graph.lines.online.value }}],
+				data: [{{ graph.lines.online.value * 1000 }}],
 				label: '{{graph.lines.online.name }}',
 				fill: false,
 				spanGaps: false,
diff --git a/src/templates/default/module/server/server/view.tpl.html b/src/templates/default/module/server/server/view.tpl.html
index 526a2744..393a86e8 100644
--- a/src/templates/default/module/server/server/view.tpl.html
+++ b/src/templates/default/module/server/server/view.tpl.html
@@ -51,7 +51,7 @@
 				<li class="list-group-item">
 					<dl class="row">
 						<dt class="col-md-4">{{ label_rtime }}:</dt>
-						<dd class="col-md-8">{{ rtime * 1000 }} {{ label_milliseconds }}</dd>
+						<dd class="col-md-8">{{ (rtime * 1000)|round(2) }} {{ label_milliseconds }}</dd>
 					</dl>
 				</li>
 			</ul>
@@ -76,7 +76,7 @@
 				<li class="list-group-item">
 					<dl class="row">
 						<dt class="col-md-6">{{ label_timeout }}:</dt>
-						<dd class="col-md-6">{{ timeout }} {{ label_milliseconds }}</dd>
+						<dd class="col-md-6">{{ timeout }} {{ label_seconds }}</dd>
 					</dl>
 				</li>
 			</ul>