diff --git a/source/helpers.pas b/source/helpers.pas
index 5c15eee6..b5a88bb1 100644
--- a/source/helpers.pas
+++ b/source/helpers.pas
@@ -2036,14 +2036,19 @@ end;
 }
 function FormatTimeNumber( Seconds: Cardinal ): String;
 var
-  h, m, s : Integer;
+  d, h, m, s : Integer;
 begin
-  s := Seconds mod (60*60*24);
+  s := Seconds;
+  d := s div (60*60*24);
+  s := s mod (60*60*24);
   h := s div (60*60);
   s := s mod (60*60);
   m := s div 60;
   s := s mod 60;
-  Result := Format('%.2d:%.2d:%.2d', [h, m, s]);
+  if d > 0 then
+    Result := Format('%d days, %.2d:%.2d:%.2d', [d, h, m, s])
+  else
+    Result := Format('%.2d:%.2d:%.2d', [h, m, s]);
 end;
 
 
diff --git a/source/main.pas b/source/main.pas
index 9828a751..9c72fd74 100644
--- a/source/main.pas
+++ b/source/main.pas
@@ -4277,20 +4277,11 @@ end;
 
 
 procedure TMainForm.TimerHostUptimeTimer(Sender: TObject);
-var
-  ServerUptime, days, hours, minutes, seconds : Integer;
 begin
-  // Host-Uptime
-  if Assigned(Connection) then begin
-    ServerUptime := Connection.ServerUptime;
-    days:= ServerUptime div (60*60*24);
-    seconds := ServerUptime mod (60*60*24);
-    hours := seconds div (60*60);
-    seconds := seconds mod (60*60);
-    minutes  := seconds div 60;
-    seconds := seconds mod 60;
-    showstatus(Format('Uptime: %d days, %.2d:%.2d:%.2d', [days,hours,minutes,seconds]), 4);
-  end else
+  // Display server uptime
+  if Assigned(Connection) then
+    showstatus('Uptime: '+FormatTimeNumber(Connection.ServerUptime), 4)
+  else
     showstatus('', 4);
 end;