diff --git a/src/root/common.tt b/src/root/common.tt
index ef3d793a..19e2462e 100644
--- a/src/root/common.tt
+++ b/src/root/common.tt
@@ -644,7 +644,7 @@ BLOCK createChart %]
 
 
 BLOCK renderMachineName;
-machine ? stripSSHUser(machine).match('^([^\.]*)').0 : "localhost";
+machine ? stripSSHUser(machine).match('^(([^\.]|\.[0-9])*)').0 : "localhost";
 END;