diff --git a/public/templates/mmcFE/statistics/pool/default.tpl b/public/templates/mmcFE/statistics/pool/default.tpl
index 57a397e6..0f8bc582 100644
--- a/public/templates/mmcFE/statistics/pool/default.tpl
+++ b/public/templates/mmcFE/statistics/pool/default.tpl
@@ -54,45 +54,45 @@
 
         <tr>
           <th align="left"></th>
-          <th align="center">Est. Shares</th>
-          <th align="center">Shares found</th>
+          <th align="center">Est. Blocks</th>
+          <th align="center">Blocks found</th>
           <th align="center">Luck</th>
         </tr>
         <tr>
-          <th align="left">since Pool Start</td>
+          <th align="left">since 1st Block</td>
           <td align="center">{($FIRSTBLOCKFOUND / $ESTTIME)|number_format:"2"}</td>
           <td align="center">{$LASTBLOCKSBYTIME.Total}</td>
-          <td align="center">{($LASTBLOCKSBYTIME.Total / ($FIRSTBLOCKFOUND / $ESTTIME) * 100)|number_format:"2"} %</td>
+          <td align="center">{IF $ESTTIME > 0}{($LASTBLOCKSBYTIME.Total / ($FIRSTBLOCKFOUND / $ESTTIME) * 100)|number_format:"2"} %{else}{($LASTBLOCKSBYTIME.Total / ($FIRSTBLOCKFOUND / 0.00) * 100)|number_format:"2"} %{/if}</td>
         </tr>
         <tr>
           <th align="left">last hour</td>
           <td align="center">{(3600 / $ESTTIME)|number_format:"2"}</td>
           <td align="center">{$LASTBLOCKSBYTIME.1HourTotal}</td>
-          <td align="center">{($LASTBLOCKSBYTIME.1HourTotal / (3600 / $ESTTIME) * 100)|number_format:"2"} %</td>
+          <td align="center">{IF $ESTTIME > 0}{($LASTBLOCKSBYTIME.1HourTotal / (3600 / $ESTTIME) * 100)|number_format:"2"} %{else}{($LASTBLOCKSBYTIME.1HourTotal / (3600 / 0.00) * 100)|number_format:"2"} %{/if}</td>
         </tr>
         <tr>
           <th align="left">last day</td>
           <td align="center">{(86400 / $ESTTIME)|number_format:"2"}</td>
           <td align="center">{$LASTBLOCKSBYTIME.24HourTotal}</td>
-          <td align="center">{($LASTBLOCKSBYTIME.24HourTotal / (86400 / $ESTTIME) * 100)|number_format:"2"} %</td>
+          <td align="center">{IF $ESTTIME > 0}{($LASTBLOCKSBYTIME.Total / (86400 / $ESTTIME) * 100)|number_format:"2"} %{else}{($LASTBLOCKSBYTIME.Total / (86400 / 0.00) * 100)|number_format:"2"} %{/if}</td>
         </tr>
         <tr>
           <th align="left">last week</td>
           <td align="center">{(604800 / $ESTTIME)|number_format:"2"}</td>
           <td align="center">{$LASTBLOCKSBYTIME.7DaysTotal}</td>
-          <td align="center">{($LASTBLOCKSBYTIME.7DaysTotal / (604800 / $ESTTIME) * 100)|number_format:"2"} %</td>
+          <td align="center">{IF $ESTTIME > 0}{($LASTBLOCKSBYTIME.Total / (604800 / $ESTTIME) * 100)|number_format:"2"} %{else} {($LASTBLOCKSBYTIME.Total / (604800 / 0.00) * 100)|number_format:"2"} %{/if}</td>
         </tr>
         <tr>
           <th align="left">last month</td>
           <td align="center">{(419200 / $ESTTIME)|number_format:"2"}</td>
           <td align="center">{$LASTBLOCKSBYTIME.4WeeksTotal}</td>
-          <td align="center">{($LASTBLOCKSBYTIME.4WeeksTotal / (2419200 / $ESTTIME) * 100)|number_format:"2"} %</td>
+          <td align="center">{IF $ESTTIME > 0}{($LASTBLOCKSBYTIME.Total / (2419200 / $ESTTIME) * 100)|number_format:"2"} %{else}{($LASTBLOCKSBYTIME.Total / (2419200 / 0.00) * 100)|number_format:"2"} %{/if}</td>
         </tr>
         <tr>
           <th align="left">last year</td>
           <td align="center">{(29030400 / $ESTTIME)|number_format:"2"}</td>
           <td align="center">{$LASTBLOCKSBYTIME.12MonthTotal}</td>
-          <td align="center">{($LASTBLOCKSBYTIME.12MonthTotal / (29030400 / $ESTTIME) * 100)|number_format:"2"} %</td>
+          <td align="center">{IF $ESTTIME > 0}{($LASTBLOCKSBYTIME.Total / (29030400 / $ESTTIME) * 100)|number_format:"2"} %{else}{($LASTBLOCKSBYTIME.Total / (29030400 / 0.00) * 100)|number_format:"2"} %{/if}</td>
         </tr>
     </table>
 {if !$GLOBAL.website.api.disabled}<li>These stats are also available in JSON format <a href="{$smarty.server.PHP_SELF}?page=api&action=getpoolstatus&api_key={$GLOBAL.userdata.api_key}">HERE</a></li>{/if}
diff --git a/public/templates/mpos/statistics/pool/general_stats.tpl b/public/templates/mpos/statistics/pool/general_stats.tpl
index c1649a59..e9faa13a 100644
--- a/public/templates/mpos/statistics/pool/general_stats.tpl
+++ b/public/templates/mpos/statistics/pool/general_stats.tpl
@@ -60,45 +60,45 @@
       <tbody>
         <tr>
           <th align="left"></th>
-          <th align="center">Est. Shares</th>
-          <th align="center">Shares found</th>
+          <th align="center">Est. Blocks</th>
+          <th align="center">Blocks found</th>
           <th align="center">Luck</th>
         </tr>
         <tr>
-          <th align="left">since Pool Start</td>
+          <th align="left">since 1st Block</td>
           <td align="center">{($FIRSTBLOCKFOUND / $ESTTIME)|number_format:"2"}</td>
           <td align="center">{$LASTBLOCKSBYTIME.Total}</td>
-          <td align="center">{($LASTBLOCKSBYTIME.Total / ($FIRSTBLOCKFOUND / $ESTTIME) * 100)|number_format:"2"} %</td>
+          <td align="center">{IF $ESTTIME > 0}{($LASTBLOCKSBYTIME.Total / ($FIRSTBLOCKFOUND / $ESTTIME) * 100)|number_format:"2"} %{else}{($LASTBLOCKSBYTIME.Total / ($FIRSTBLOCKFOUND / 0.00) * 100)|number_format:"2"} %{/if}</td>
         </tr>
         <tr>
           <th align="left">last hour</td>
           <td align="center">{(3600 / $ESTTIME)|number_format:"2"}</td>
           <td align="center">{$LASTBLOCKSBYTIME.1HourTotal}</td>
-          <td align="center">{($LASTBLOCKSBYTIME.1HourTotal / (3600 / $ESTTIME) * 100)|number_format:"2"} %</td>
+          <td align="center">{IF $ESTTIME > 0}{($LASTBLOCKSBYTIME.1HourTotal / (3600 / $ESTTIME) * 100)|number_format:"2"} %{else}{($LASTBLOCKSBYTIME.1HourTotal / (3600 / 0.00) * 100)|number_format:"2"} %{/if}</td>
         </tr>
         <tr>
           <th align="left">last day</td>
           <td align="center">{(86400 / $ESTTIME)|number_format:"2"}</td>
           <td align="center">{$LASTBLOCKSBYTIME.24HourTotal}</td>
-          <td align="center">{($LASTBLOCKSBYTIME.24HourTotal / (86400 / $ESTTIME) * 100)|number_format:"2"} %</td>
+          <td align="center">{IF $ESTTIME > 0}{($LASTBLOCKSBYTIME.Total / (86400 / $ESTTIME) * 100)|number_format:"2"} %{else}{($LASTBLOCKSBYTIME.Total / (86400 / 0.00) * 100)|number_format:"2"} %{/if}</td>
         </tr>
         <tr>
           <th align="left">last week</td>
           <td align="center">{(604800 / $ESTTIME)|number_format:"2"}</td>
           <td align="center">{$LASTBLOCKSBYTIME.7DaysTotal}</td>
-          <td align="center">{($LASTBLOCKSBYTIME.7DaysTotal / (604800 / $ESTTIME) * 100)|number_format:"2"} %</td>
+          <td align="center">{IF $ESTTIME > 0}{($LASTBLOCKSBYTIME.Total / (604800 / $ESTTIME) * 100)|number_format:"2"} %{else} {($LASTBLOCKSBYTIME.Total / (604800 / 0.00) * 100)|number_format:"2"} %{/if}</td>
         </tr>
         <tr>
           <th align="left">last month</td>
           <td align="center">{(419200 / $ESTTIME)|number_format:"2"}</td>
           <td align="center">{$LASTBLOCKSBYTIME.4WeeksTotal}</td>
-          <td align="center">{($LASTBLOCKSBYTIME.4WeeksTotal / (2419200 / $ESTTIME) * 100)|number_format:"2"} %</td>
+          <td align="center">{IF $ESTTIME > 0}{($LASTBLOCKSBYTIME.Total / (2419200 / $ESTTIME) * 100)|number_format:"2"} %{else}{($LASTBLOCKSBYTIME.Total / (2419200 / 0.00) * 100)|number_format:"2"} %{/if}</td>
         </tr>
         <tr>
           <th align="left">last year</td>
           <td align="center">{(29030400 / $ESTTIME)|number_format:"2"}</td>
           <td align="center">{$LASTBLOCKSBYTIME.12MonthTotal}</td>
-          <td align="center">{($LASTBLOCKSBYTIME.12MonthTotal / (29030400 / $ESTTIME) * 100)|number_format:"2"} %</td>
+          <td align="center">{IF $ESTTIME > 0}{($LASTBLOCKSBYTIME.Total / (29030400 / $ESTTIME) * 100)|number_format:"2"} %{else}{($LASTBLOCKSBYTIME.Total / (29030400 / 0.00) * 100)|number_format:"2"} %{/if}</td>
         </tr>
       </tbody>
     </table>