diff --git a/view/admin_plugins_details.tpl b/view/admin_plugins_details.tpl
index 85ee8dfb40..e2c611b236 100644
--- a/view/admin_plugins_details.tpl
+++ b/view/admin_plugins_details.tpl
@@ -4,9 +4,11 @@
 	<p><span class='toggleplugin icon $status'></span> $info.name - $info.version : <a href="$baseurl/admin/plugins/$plugin/?a=t">$action</a></p>
 	<p>$info.description</p>
 	
+	<p class="author">
 	{{ for $info.author as $a }}
-		<p class="author">{{ if $a.link }}<a href="$a.link"><span class='icon remote-link'></span></a>{{ endif }}$a.name</p>
+		{{ if $a.link }}<a href="$a.link">$a.name</a>{{ else }}$a.name{{ endif }},
 	{{ endfor }}
+	</p>
 	
 	
 
diff --git a/view/admin_users.tpl b/view/admin_users.tpl
new file mode 100644
index 0000000000..952a8992b5
--- /dev/null
+++ b/view/admin_users.tpl
@@ -0,0 +1,88 @@
+<script>
+	function confirm_delete(uname){
+		return confirm( "$confirm_delete".format(uname));
+	}
+	function confirm_delete_multi(){
+		return confirm("$confirm_delete_multi");
+	}
+	function selectall(cls){
+		$("."+cls).attr('checked','checked');
+		return false;
+	}
+</script>
+<div id='adminpage'>
+	<h1>$title - $page</h1>
+	
+	<form action="$baseurl/admin/users" method="post">
+		
+		<h3>$h_pending</h3>
+		{{ if $pending }}
+			<table id='pending'>
+				<thead>
+				<tr>
+					{{ for $th_pending as $th }}<th>$th</th>{{ endfor }}
+					<th></th>
+					<th></th>
+				</tr>
+				</thead>
+				<tbody>
+			{{ for $pending as $u }}
+				<tr>
+					<td class="created">$u.created</td>
+					<td class="name">$u.name</td>
+					<td class="email">$u.email</td>
+					<td class="checkbox"><input type="checkbox" class="pending_ckbx" id="id_pending_$u.hash" name="pending_$u.hash"/></td>
+					<td class="tools">
+						<a href="$baseurl/regmod/allow/$u.hash" title='$approve'><span class='icon like'></span></a>
+						<a href="$baseurl/regmod/deny/$u.hash" title='$deny'><span class='icon dislike'></span></a>
+					</td>
+				</tr>
+			{{ endfor }}
+				</tbody>
+			</table>
+			<div class='selectall'><a href='#' onclick="return selectall('pending_ckbx');">$select_all</a></div>
+			<div class="submit"><input type="submit" name="page_users_deny" value="$deny"/> <input type="submit" name="page_users_approve" value="$approve" /></div>			
+		{{ else }}
+			<p>$no_pending</p>
+		{{ endif }}
+	
+	
+		
+	
+		<h3>$h_users</h3>
+		{{ if $users }}
+			<table id='users'>
+				<thead>
+				<tr>
+					<th></th>
+					{{ for $th_users as $th }}<th>$th</th>{{ endfor }}
+					<th></th>
+					<th></th>
+				</tr>
+				</thead>
+				<tbody>
+				{{ for $users as $u }}
+					<tr>
+						<td><img src="$u.micro" alt="$u.nickname" title="$u.nickname"></td>
+						<td class='name'><a href="$u.url" title="$u.nickname" >$u.name</a></td>
+						<td class='email'>$u.email</td>
+						<td class='register_date'>$u.register_date</td>
+						<td class='login_date'>$u.login_date</td>
+						<td class='lastitem_date'>$u.lastitem_date</td>
+						<td class='login_date'>$u.page-flags</td>
+						<td class="checkbox"><input type="checkbox" class="users_ckbx" id="id_user_$u.uid" name="user_$u.uid"/></td>
+						<td class="tools">
+							<a href="$baseurl/admin/users/block/$u.uid" title='{{ if $u.blocked }}$unblock{{ else }}$block{{ endif }}'><span class='icon block {{ if $u.blocked==0 }}dim{{ endif }}'></span></a>
+							<a href="$baseurl/admin/users/delete/$u.uid" title='$discard' onclick="return confirm_delete('$u.name')"><span class='icon drop'></span></a>
+						</td>
+					</tr>
+				{{ endfor }}
+				</tbody>
+			</table>
+			<div class='selectall'><a href='#' onclick="return selectall('users_ckbx');">$select_all</a></div>
+			<div class="submit"><input type="submit" name="page_users_block" value="$block/$unblock" /> <input type="submit" name="page_users_delete" value="$delete" onclick="return confirm_delete_multi()" /></div>						
+		{{ else }}
+			NO USERS?!?
+		{{ endif }}
+	</form>
+</div>
diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css
index b94d90618a..4aad4339fe 100644
--- a/view/theme/duepuntozero/style.css
+++ b/view/theme/duepuntozero/style.css
@@ -2557,12 +2557,13 @@ a.mail-list-link {
 	float:left;
 	margin-right: 1em;
 }
-#adminpage .author .icon { float: left;}
+
 #adminpage table {width:100%; border-bottom: 1p solid #000000; margin: 5px 0px;}
 #adminpage table th { text-align: left;}
 #adminpage td .icon { float: left;}
 #adminpage table#users img { width: 16px; height: 16px; }
 #adminpage table tr:hover { background-color: #bbc7d7; }
+#adminpage .selectall { text-align: right; }
 /**
  * ICONS
  */
diff --git a/view/theme/loozah/style.css b/view/theme/loozah/style.css
index db53cb6782..947b76fec0 100644
--- a/view/theme/loozah/style.css
+++ b/view/theme/loozah/style.css
@@ -2564,6 +2564,12 @@ a.mail-list-link {
 	margin-right: 1em;
 }
 
+#adminpage table {width:100%; border-bottom: 1p solid #000000; margin: 5px 0px;}
+#adminpage table th { text-align: left;}
+#adminpage td .icon { float: left;}
+#adminpage table#users img { width: 16px; height: 16px; }
+#adminpage table tr:hover { background-color: #bbc7d7; }
+#adminpage .selectall { text-align: right; }
 /**
  * ICONS
  */
@@ -2606,6 +2612,8 @@ a.mail-list-link {
 
 .off { background-position: 0px -48px; }
 
+.icon.dim { opacity: 0.3;filter:alpha(opacity=30); }
+
 .attachtype {
 	display: block; width: 20px; height: 23px;
 	float: left;