diff --git a/web/templates/default/userstats.inc b/web/templates/default/userstats.inc
index 177103e6e944c9890ed3e5a96eeb1bba5a59edb1..9726faa58ceef19ab3aa7f983b590a22555b1bb1 100644
--- a/web/templates/default/userstats.inc
+++ b/web/templates/default/userstats.inc
@@ -5,20 +5,23 @@
    
 <table class="userstats" border="0" cellpadding="2" cellspacing="2">
 <tr>
-    <<REPEAT first>>
-        @@first:html@@
-    <<END REPEAT first>>
+  <td class="userstats">First on:</td>
+  <td class="userstats">%%JS:strftime("%b-%d-%y",user.stats.firston_date)%%</td>
+  <td class="userstats">Expire:</td>
+  <td class="userstats">%%JS:user.security.expiration_date?strftime("%b-%d-%y",user.security.expiration_date):"Never"%%</td>
+  <td class="userstats">Last on:</td>
+  <td class="userstats">%%JS:strftime("%b-%d-%y",user.stats.laston_date)%%</td>
+  <td class="userstats" colspan="2">%%JS:strftime("%H:%M",user.stats.laston_date)%%</td>
 </tr>
 <tr>
   <td class="userstats">Time on:</td>
-  <td class="userstats">@@total_timeon@@</td>
+  <td class="userstats">%%JS:user.stats.total_timeon%%</td>
   <td class="userstats">Today:</td>
   <td class="userstats"> 
   <table width="100%" border="0" cellpadding="0" cellspacing="0">
     <tr>
-        <<REPEAT second>>
-            @@second:html@@
-        <<END REPEAT second>>
+      <td class="userstats" align="left">%%JS:user.stats.timeon_today%%&nbsp;</td>
+      <td class="userstats" align="right">&nbsp;%%JS:user.limits.time_per_day;%%</td>
     </tr>
   </table>
   </td>
@@ -26,25 +29,23 @@
   <td class="userstats">
     <table width="100%" border="0" cellpadding="0" cellspacing="0">
     <tr>
-        <<REPEAT third>>
-            @@third:html@@
-        <<END REPEAT third>>
+      <td class="userstats" align="left">%%JS:user.stats.timeon_last_logon%%&nbsp;</td>
+      <td class="userstats" align="right">&nbsp;%%JS:user.limits.time_per_logon;%%</td>
     </tr>
     </table>
   </td>
   <td class="userstats">Extra:</td>
-  <td class="userstats">@@extra_time@@</td>
+  <td class="userstats">%%JS:user.security.extra_time%%</td>
 </tr>
 <tr>
   <td class="userstats">Logons:</td>
-  <td class="userstats">@@total_logons@@</td>
+  <td class="userstats">%%JS:user.stats.total_logons%%</td>
   <td class="userstats">Today:</td>
   <td class="userstats">
     <table width="100%" border="0" cellpadding="0" cellspacing="0">
     <tr>
-        <<REPEAT fourth>>
-            @@fourth:html@@
-        <<END REPEAT fourth>>
+      <td class="userstats" align="left">%%JS:user.stats.logons_today%%&nbsp;</td>
+      <td class="userstats" align="right">&nbsp;%%JS:user.limits.logons_per_day%%</td>
     </tr>
     </table>
   </td>
@@ -52,41 +53,45 @@
   <td class="userstats">
     <table width="100%" border="0" cellpadding="0" cellspacing="0">
     <tr>
-        <<REPEAT fifth>>
-            @@fifth:html@@
-        <<END REPEAT fifth>>
+      <td class="userstats" align="left">%%JS:user.stats.total_posts%%&nbsp;</td>
+      <td class="userstats" align="right">&nbsp;%%pinfo%%</td>
     </tr>
     </table>
   </td>
   <td class="userstats">Today:</td>
-  <td class="userstats">@@posts_today@@</td>
+  <td class="userstats">%%JS:user.stats.posts_today%%</td>
 </tr>
 <tr>
-    <<REPEAT sixth>>
-        @@sixth:html@@
-    <<END REPEAT sixth>>
+  <td class="userstats">E-Mails:</td>
+  <td class="userstats">%%JS:user.stats.total_emails%%</td>
+  <td class="userstats">To sysop:</td>
+  <td class="userstats">%%JS:user.stats.total_feedbacks%%</td>
+  <td class="userstats">Waiting:</td>
+  <td class="userstats">%%JS:user.stats.mail_waiting%%</td>
+  <td class="userstats">Today:</td>
+  <td class="userstats">%%JS:user.stats.email_today%%</td>
 </tr>
 <tr>
   <td class="userstats" colspan="8">&nbsp;</td>
 </tr>
   <tr>
     <td class="userstats">Uploads:</td>
-    <td class="userstats" align="right">@@bytes_uploaded@@</td>
-    <td class="userstats" colspan="6">bytes in @@files_uploaded@@ files</td>
+    <td class="userstats" align="right">%%bytes_uploaded%%</td>
+    <td class="userstats" colspan="6">bytes in %%files_uploaded%% files</td>
   </tr>
   <tr>
     <td class="userstats">Downloads:</td>
-    <td class="userstats" align="right">@@bytes_downloaded@@</td>
-    <td class="userstats" colspan="6">bytes in @@files_downloaded@@ files</td>
+    <td class="userstats" align="right">%%bytes_downloaded%%</td>
+    <td class="userstats" colspan="6">bytes in %%files_downloaded%% files</td>
   </tr>
   <tr>
     <td class="userstats">Credits:</td>
-    <td class="userstats" align="right">@@credits@@</td>
-    <td class="userstats" colspan="6">free: @@freecreds@@ (@@freeday@@ per day)</td>
+    <td class="userstats" align="right">%%credits%%</td>
+    <td class="userstats" colspan="6">free: %%freecreds%% (%%freeday%% per day)</td>
   </tr>
   <tr>
     <td class="userstats">Minutes:</td>
-    <td class="userstats" align="right">@@tbank@@</td>
+    <td class="userstats" align="right">%%tbank%%</td>
     <td class="userstats" colspan="6">&nbsp;</td>
   </tr>
 </table>