diff --git a/www/templates/charisma/views/frontend/profile.tpl b/www/templates/charisma/views/frontend/profile.tpl
index d89831671..7a6644aa5 100644
--- a/www/templates/charisma/views/frontend/profile.tpl
+++ b/www/templates/charisma/views/frontend/profile.tpl
@@ -83,7 +83,7 @@
 															<tr>
 																<th>API Hits Today</th>
 																<td>
-																	<span id="uatd">{$apirequests.num}</span>  {if $userdata.role==2 && $apirequests.num > 0}
+																	<span id="uatd">{$apirequests}</span>  {if $isadmin && $apirequests > 0}
 																		<a
 																		onclick="resetapireq({$user.id}, 'api'); document.getElementById('uatd').innerHTML='0'; return false;"
 																		href="#" class="label label-danger">
@@ -91,12 +91,12 @@
 															</tr>
 															<tr>
 																<th>Downloads Today</th>
-																<td><span id="ugrtd">{$grabstoday.num}</span> /
-																	Unlimited {if $grabstoday.num >= $user.downloadrequests}&nbsp;&nbsp;
+																<td><span id="ugrtd">{$user.grabs}</span> /
+																	Unlimited {if $user.grabs >= $user.downloadrequests}&nbsp;&nbsp;
 																		<small>(Next DL
 																		in {($grabstoday.nextdl/3600)|intval}
 																		h {($grabstoday.nextdl/60) % 60}
-																		m)</small>{/if}{if $userdata.role==2 && $grabstoday.num > 0}
+																		m)</small>{/if}{if $isadmin && $user.grabs > 0}
 																		<a
 																		onclick="resetapireq({$user.id}, 'grabs'); document.getElementById('ugrtd').innerHTML='0'; return false;"
 																		href="#" class="label label-danger">
diff --git a/www/templates/nntmux/views/frontend/forumpost.tpl b/www/templates/nntmux/views/frontend/forumpost.tpl
index 8382fc526..8da10ba0f 100644
--- a/www/templates/nntmux/views/frontend/forumpost.tpl
+++ b/www/templates/nntmux/views/frontend/forumpost.tpl
@@ -23,7 +23,7 @@
 					{$result.username}
 				{/if}
 				on <span title="{$result.createddate}">{$result.createddate|date_format}</span> <div class="hint">({$result.createddate|timeago})</div>
-				{if $userdata.role==2}
+				{if $isadmin}
 				<div>
 					<a class="rndbtn confirm_action" href="{$smarty.const.WWW_TOP}/admin/forum-delete.php?id={$result.id}&amp;from={$smarty.server.REQUEST_URI|escape:"url"}" title="Delete Post">Delete</a>
 				</div>
diff --git a/www/templates/nntmux/views/frontend/profile.tpl b/www/templates/nntmux/views/frontend/profile.tpl
index dbe2fd0c0..f77f1f2e0 100644
--- a/www/templates/nntmux/views/frontend/profile.tpl
+++ b/www/templates/nntmux/views/frontend/profile.tpl
@@ -8,15 +8,15 @@
 	<tr><th>Last Login:</th><td title="{$user.lastlogin}">{$user.lastlogin|date_format}  ({$user.lastlogin|timeago} ago)</td></tr>
 	<tr><th>Role:</th><td>{$user.rolename}</td></tr>
 	<tr><th>Theme:</th><td>{$user.style}</td></tr>
-	{if $userdata.role==2}<tr><th title="Admin Notes">Notes:</th><td>{$user.notes|escape:htmlall}{if $user.notes|count_characters > 0}<br/>{/if}<a href="{$smarty.const.WWW_TOP}/admin/user-edit.php?id={$user.id}#notes">Add/Edit</a></td></tr>{/if}
+	{if $isadmin}<tr><th title="Admin Notes">Notes:</th><td>{$user.notes|escape:htmlall}{if $user.notes|count_characters > 0}<br/>{/if}<a href="{$smarty.const.WWW_TOP}/admin/user-edit.php?id={$user.id}#notes">Add/Edit</a></td></tr>{/if}
 	{if $isadmin || !$publicview}<tr><th title="Not public">Site Api/Rss Key:</th><td><a href="{$smarty.const.WWW_TOP}/rss?t=0&amp;dl=1&amp;i={$user.id}&amp;r={$user.rsstoken}">{$user.rsstoken}</a></td></tr>{/if}
 	{if $isadmin || !$publicview}
-	<tr><th>API Hits Today:</th><td><span id="uatd">{$apirequests.num}</span> {if $userdata.role==2 && $apirequests.num > 0}<a onclick="resetapireq({$user.id}, 'api'); document.getElementById('uatd').innerHTML='0'; return false;" href="#">Reset</a>{/if}</td></tr>
-	<tr><th>Grabs Today:</th><td><span id="ugrtd">{$grabstoday.num}</span> {if $grabstoday.num >= $user.downloadrequests}&nbsp;&nbsp;<small>(Next DL in {($grabstoday.nextdl/3600)|intval}h {($grabstoday.nextdl/60) % 60}m)</small>{/if}{if $userdata.role==2 && $grabstoday.num > 0}<a onclick="resetapireq({$user.id}, 'grabs'); document.getElementById('ugrtd').innerHTML='0'; return false;" href="#">Reset</a>{/if}</td></tr>
+	<tr><th>API Hits Today:</th><td><span id="uatd">{$apirequests.num}</span> {if $isadmin && $apirequests.num > 0}<a onclick="resetapireq({$user.id}, 'api'); document.getElementById('uatd').innerHTML='0'; return false;" href="#">Reset</a>{/if}</td></tr>
+	<tr><th>Grabs Today:</th><td><span id="ugrtd">{$user.grabs}</span> {if $user.grabs >= $user.downloadrequests}&nbsp;&nbsp;<small>(Next DL in {($grabstoday.nextdl/3600)|intval}h {($grabstoday.nextdl/60) % 60}m)</small>{/if}{if $isadmin && $user.grabs > 0}<a onclick="resetapireq({$user.id}, 'grabs'); document.getElementById('ugrtd').innerHTML='0'; return false;" href="#">Reset</a>{/if}</td></tr>
 	{/if}
 	<tr><th>Grabs Total:</th><td>{$user.grabs}</td></tr>
 
-	{if ($user.id==$userdata.id || $userdata.role==2) && $site->registerstatus==1}
+	{if ($user.id==$userdata.id || $isadmin) && $site->registerstatus==1}
 	<tr>
 		<th title="Not public">Invites:</th>
 		<td>{$user.invites}
@@ -91,7 +91,7 @@
 </table>
 
 
-{if $userdata.role==2 && $downloadlist|@count > 0}
+{if $isadmin && $downloadlist|@count > 0}
 <div style="padding-top:20px;">
 	<h2>Downloads for User</h2>
 
diff --git a/www/templates/omicron/views/frontend/profile.tpl b/www/templates/omicron/views/frontend/profile.tpl
index f60696ab0..055b709e1 100644
--- a/www/templates/omicron/views/frontend/profile.tpl
+++ b/www/templates/omicron/views/frontend/profile.tpl
@@ -83,7 +83,7 @@
 															<tr>
 																<th>API Hits Today</th>
 																<td>
-																	<span id="uatd">{$apirequests.num}</span>  {if $userdata.role==2 && $apirequests.num > 0}
+																	<span id="uatd">{$apirequests.num}</span>  {if $isadmin && $apirequests.num > 0}
 																		<a
 																		onclick="resetapireq({$user.id}, 'api'); document.getElementById('uatd').innerHTML='0'; return false;"
 																		href="#" class="label label-danger">
@@ -91,12 +91,12 @@
 															</tr>
 															<tr>
 																<th>Downloads Today</th>
-																<td><span id="ugrtd">{$grabstoday.num}</span> /
-																	Unlimited {if $grabstoday.num >= $user.downloadrequests}&nbsp;&nbsp;
+																<td><span id="ugrtd">{$user.grabs}</span> /
+																	Unlimited {if $user.grabs >= $user.downloadrequests}&nbsp;&nbsp;
 																		<small>(Next DL
 																		in {($grabstoday.nextdl/3600)|intval}
 																		h {($grabstoday.nextdl/60) % 60}
-																		m)</small>{/if}{if $userdata.role==2 && $grabstoday.num > 0}
+																		m)</small>{/if}{if $isadmin && $user.grabs > 0}
 																		<a
 																		onclick="resetapireq({$user.id}, 'grabs'); document.getElementById('ugrtd').innerHTML='0'; return false;"
 																		href="#" class="label label-danger">