diff --git a/mailbox/system_info.pl b/mailbox/system_info.pl
index 24301af3..74ad34ef 100644
--- a/mailbox/system_info.pl
+++ b/mailbox/system_info.pl
@@ -13,23 +13,26 @@ sub list_system_info
 my @table;
 my $table = { 'type' => 'table',
               'desc' => $text{'right_header'},
-	      'priority' => 10,
+              'priority' => 10,
               'table' => \@table };
 
 # Hostname
 push(@table, { 'desc' => $text{'right_host'},
-	       'value' => &get_display_hostname() });
+               'value' => &get_display_hostname(),
+               'type' => 'host' });
 
 # Operating system
 push(@table, { 'desc' => $text{'right_os'},
                'value' => $gconfig{'os_version'} eq '*' ?
                         $gconfig{'real_os_type'} :
-                        $gconfig{'real_os_type'}.' '.$gconfig{'real_os_version'}
+                        $gconfig{'real_os_type'}.' '.$gconfig{'real_os_version'},
+               'type' => 'os'
              });
 
 # Usermin version
 push(@table, { 'desc' => $text{'right_usermin'},
-	       'value' => &get_webmin_version() });
+               'value' => &get_webmin_version(),
+               'type' => 'ver' });
 
 # System time
 my $tm = localtime(time());
@@ -38,7 +41,8 @@ sub list_system_info
    $tm = make_date(time(), {get => 'complete'});
    }
 push(@table, { 'desc' => $text{'right_time'},
-	       'value' => $tm });
+               'value' => $tm,
+               'type' => 'time' });
 
 return ($table);
 }
diff --git a/mailbox/ulang/de b/mailbox/ulang/de
index aca41ff9..71680681 100644
--- a/mailbox/ulang/de
+++ b/mailbox/ulang/de
@@ -259,5 +259,5 @@ allow_eaddr='$1' ist keine gültige Mail-Adresse
 right_header=System Information
 right_host=System Hostname
 right_os=Betriebssystem
-right_usermin=Usermin Version
+right_usermin=Usermin version
 right_time=Systemzeit
diff --git a/mailbox/ulang/en b/mailbox/ulang/en
index eb747f6d..48689627 100644
--- a/mailbox/ulang/en
+++ b/mailbox/ulang/en
@@ -287,5 +287,5 @@ allow_eaddr='$1' is not a valid email address
 right_header=System Information
 right_host=System hostname
 right_os=Operating system
-right_usermin=Usermin Version
+right_usermin=Usermin version
 right_time=Time on system
diff --git a/mailbox/ulang/ms.auto b/mailbox/ulang/ms.auto
index 78ff0edd..57a47ee8 100644
--- a/mailbox/ulang/ms.auto
+++ b/mailbox/ulang/ms.auto
@@ -260,5 +260,5 @@ allow_eaddr='$1' bukan alamat e-mel yang sah
 right_header=Maklumat sistem
 right_host=Nama hos sistem
 right_os=Sistem operasi
-right_usermin=Usermin Version
+right_usermin=Usermin version
 right_time=Masa pada sistem