diff --git a/public/include/classes/statistics.class.php b/public/include/classes/statistics.class.php
index b86acd72..a63416dd 100644
--- a/public/include/classes/statistics.class.php
+++ b/public/include/classes/statistics.class.php
@@ -189,14 +189,12 @@ class Statistics {
         a.username AS username,
         a.donate_percent AS donate_percent,
         a.email AS email,
-        ROUND(COUNT(s.id) * POW(2," . $this->config['difficulty'] . ") / 600 / 1000,2) AS hashrate,
-        ( SELECT COUNT(id) FROM " . $this->share->getTableName() . " WHERE a.username = SUBSTRING_INDEX( s.username, '.', 1 ) ) AS shares
+	COUNT(s.id) AS shares
       FROM " . $this->user->getTableName() . " AS a
       LEFT JOIN " . $this->share->getTableName() . " AS s
       ON a.username = SUBSTRING_INDEX( s.username, '.', 1 )
       WHERE
-      a.username LIKE ?
-      AND s.time > DATE_SUB(now(), INTERVAL 10 MINUTE)
+      	a.username LIKE ?
       GROUP BY username
       ORDER BY username
         ");
diff --git a/public/include/pages/admin/user.inc.php b/public/include/pages/admin/user.inc.php
index cc961f44..b6dab89b 100644
--- a/public/include/pages/admin/user.inc.php
+++ b/public/include/pages/admin/user.inc.php
@@ -21,6 +21,7 @@ if ($_POST['query']) {
   // Query against the stats table? Currently cached though.
   foreach ($aUsers as $iKey => $aUser) {
     $aUser['balance'] = $transaction->getBalance($aUser['id']);
+    $aUser['hashrate'] = $statistics->getUserHashrate($aUser['id']);
     $aUser['payout']['est_block'] = round(( (int)$aUser['shares'] / (int)$aRoundShares['valid'] ) * (int)$config['reward'], 3);
     $aUser['payout']['est_fee'] = round(($config['fees'] / 100) * $aUser['payout']['est_block'], 3);
     $aUser['payout']['est_donation'] = round((( $aUser['donate_percent'] / 100) * ($aUser['payout']['est_block'] - $aUser['payout']['est_fee'])), 3);