diff --git a/view/templates/admin/users.tpl b/view/templates/admin/users.tpl
index 8bbffbb7d..d2850519a 100644
--- a/view/templates/admin/users.tpl
+++ b/view/templates/admin/users.tpl
@@ -1,159 +1,179 @@
-
 <script>
-	function confirm_delete(uname){
-		return confirm( "{{$confirm_delete}}".format(uname));
+	function confirm_delete(uname) {
+		return confirm("{{$confirm_delete}}".format(uname));
 	}
-	function confirm_delete_multi(){
+
+	function confirm_delete_multi() {
 		return confirm("{{$confirm_delete_multi}}");
 	}
-	function selectall(cls){
-		$("."+cls).attr('checked','checked');
+
+	function selectall(cls) {
+		$("." + cls).attr('checked', 'checked');
 		return false;
 	}
 </script>
-<div id='adminpage'>
+<div id="adminpage">
 	<h1>{{$title}} - {{$page}}</h1>
-	
+
 	<form action="{{$baseurl}}/admin/users" method="post">
-        <input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
-		
-		<h3>{{$h_pending}}</h3>
-		{{if $pending}}
-			<table id='pending'>
-				<thead>
-				<tr>
-					{{foreach $th_pending as $th}}<th>{{$th}}</th>{{/foreach}}
-					<th></th>
-					<th></th>
-				</tr>
-				</thead>
-				<tbody>
+		<input type="hidden" name="form_security_token" value="{{$form_security_token}}">
+
+		<h2>{{$h_pending}}</h2>
+	{{if $pending}}
+		<table id="pending">
+			<thead>
+			<tr>
+				{{foreach $th_pending as $th}}
+					<th>{{$th}}</th>{{/foreach}}
+				<th></th>
+				<th></th>
+			</tr>
+			</thead>
+			<tbody>
 			{{foreach $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[]" value="{{$u.hash}}" /></td>
+					<td class="checkbox">
+						<input type="checkbox" class="pending_ckbx" id="id_pending_{{$u.hash}}" name="pending[]" value="{{$u.hash}}"/>
+					</td>
 					<td class="tools">
-						<a href="{{$baseurl}}/admin/users/allow/{{$u.uid}}?t={{$form_security_token}}" title='{{$approve}}'><span class='icon like'></span></a>
-						<a href="{{$baseurl}}/admin/users/deny/{{$u.uid}}?t={{$form_security_token}}" title='{{$deny}}'><span class='icon dislike'></span></a>
+						<a href="{{$baseurl}}/admin/users/allow/{{$u.uid}}?t={{$form_security_token}}" title="{{$approve}}">
+							<span class="icon like"></span>
+						</a>
+						<a href="{{$baseurl}}/admin/users/deny/{{$u.uid}}?t={{$form_security_token}}" title="{{$deny}}">
+							<span class="icon dislike"></span>
+						</a>
 					</td>
 				</tr>
 				<tr>
 					<td class="pendingnote"><p><span>{{$pendingnotetext}}:</span> {{$u.note}}</p></td>
 				</tr>
 			{{/foreach}}
-				</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>
-		{{/if}}
-	
-		<h3>{{$h_users}}</h3>
-		{{if $users}}
-			<table id='users'>
-				<thead>
-				<tr>
-					<th></th>
-					{{foreach $th_users as $th}}
+			</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>
+	{{/if}}
+
+		<h2>{{$h_users}}</h2>
+	{{if $users}}
+		<table id="users">
+			<thead>
+			<tr>
+				<th></th>
+				{{foreach $th_users as $th}}
 					<th>
 						<a href="{{$baseurl}}/admin/users/?o={{if $order_direction_users == "+"}}-{{/if}}{{$th.1}}">
-							{{if $order_users == $th.1}}
-								{{if $order_direction_users == "+"}}
+						{{if $order_users == $th.1}}
+							{{if $order_direction_users == "+"}}
 								&#8595;
-								{{else}}
-								&#8593;
-								{{/if}}
 							{{else}}
-								&#8597;
+								&#8593;
 							{{/if}}
-						{{$th.0}}</a>
+						{{else}}
+							&#8597;
+						{{/if}}
+							{{$th.0}}
+						</a>
 					</th>
-					{{/foreach}}
-					<th></th>
-					<th></th>
-				</tr>
-				</thead>
-				<tbody>
-				{{foreach $users as $u}}
-					<tr>
-						<td><img class='icon' 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}} {{if $u.is_admin}}({{$siteadmin}}){{/if}} {{if $u.account_expired}}({{$accountexpired}}){{/if}} {{if $u.blocked}}{{$blocked}}{{/if}}</td>
-						<td class="checkbox"> 
-						{{if $u.is_deletable}}
-							<input type="checkbox" class="users_ckbx" id="id_user_{{$u.uid}}" name="user[]" value="{{$u.uid}}"/></td>
-						{{else}}
-							&nbsp;
-						{{/if}}
-						<td class="tools">
-						{{if $u.is_deletable}}
-							<a href="{{$baseurl}}/admin/users/block/{{$u.uid}}?t={{$form_security_token}}" title='{{if $u.blocked}}{{$unblock}}{{else}}{{$block}}{{/if}}'><span class='icon block {{if $u.blocked==0}}dim{{/if}}'></span></a>
-							<a href="{{$baseurl}}/admin/users/delete/{{$u.uid}}?t={{$form_security_token}}" title='{{$delete}}' onclick="return confirm_delete('{{$u.name}}')"><span class='icon drop'></span></a>
-						{{else}}
-							&nbsp;
-						{{/if}}
-						</td>
-					</tr>
 				{{/foreach}}
-				</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}}" />
-				<input type="submit" name="page_users_unblock" value="{{$unblock}}" />
-				<input type="submit" name="page_users_delete" value="{{$delete}}" onclick="return confirm_delete_multi()" />
-			</div>
-		{{else}}
-			NO USERS?!?
-		{{/if}}
-	</form>
-	{{if $deleted}}
-		<h3>{{$h_deleted}}</h3>
-			<table id='deleted'>
-				<thead>
+				<th></th>
+				<th></th>
+			</tr>
+			</thead>
+			<tbody>
+			{{foreach $users as $u}}
 				<tr>
-					<th></th>
-					{{foreach $th_deleted as $th}}<th>{{$th}}</th>{{/foreach}}
+					<td><img class="icon" 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}} {{if $u.is_admin}}({{$siteadmin}}){{/if}} {{if $u.account_expired}}({{$accountexpired}}){{/if}} {{if $u.blocked}}{{$blocked}}{{/if}}</td>
+					<td class="checkbox">
+						{{if $u.is_deletable}}
+						<input type="checkbox" class="users_ckbx" id="id_user_{{$u.uid}}" name="user[]" value="{{$u.uid}}"/>
+						{{else}}
+							&nbsp;
+						{{/if}}
+					</td>
+
+					<td class="tools">
+						{{if $u.is_deletable}}
+							<a href="{{$baseurl}}/admin/users/block/{{$u.uid}}?t={{$form_security_token}}" title="{{if $u.blocked}}{{$unblock}}{{else}}{{$block}}{{/if}}">
+								<span class="icon block {{if $u.blocked==0}}dim{{/if}}"></span>
+							</a>
+							<a href="{{$baseurl}}/admin/users/delete/{{$u.uid}}?t={{$form_security_token}}" title="{{$delete}}" onclick="return confirm_delete('{{$u.name}}')">
+								<span class="icon drop"></span>
+							</a>
+						{{else}}
+							&nbsp;
+						{{/if}}
+					</td>
 				</tr>
-				</thead>
-				<tbody>
-				{{foreach $deleted as $u}}
-					<tr>
-						<td><img class='icon' 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.deleted}}</td>
-					</tr>
-				{{/foreach}}
-				</tbody>
-			</table>
-		{{/if}}
-  <h3>{{$h_newuser}}</h3> 
-  <form action="{{$baseurl}}/admin/users" method="post"> 
-  <input type='hidden' name='form_security_token' value='{{$form_security_token}}'> 
-  <table id='users'> 
-      <tbody> 
-        <tr> 
-        <td>{{include file="field_input.tpl" field=$newusername}}</td> 
-    </tr> 
-        <tr> 
-        <td>{{include file="field_input.tpl" field=$newusernickname}}</td> 
-    </tr> 
-        <tr> 
-        <td>{{include file="field_input.tpl" field=$newuseremail}}</td> 
-    </tr> 
-      </tbody> 
-  </table> 
-  <div class="submit"><input type="submit" name="add_new_user_submit" value="{{$submit}}" /></div>
-  </form>
+			{{/foreach}}
+			</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}}"/>
+			<input type="submit" name="page_users_unblock" value="{{$unblock}}"/>
+			<input type="submit" name="page_users_delete" value="{{$delete}}" onclick="return confirm_delete_multi()"/>
+		</div>
+	{{else}}
+		NO USERS?!?
+	{{/if}}
+	</form>
+{{if $deleted}}
+	<h2>{{$h_deleted}}</h2>
+	<table id="deleted">
+		<thead>
+		<tr>
+			<th></th>
+		{{foreach $th_deleted as $th}}
+			<th>{{$th}}</th>
+		{{/foreach}}
+		</tr>
+		</thead>
+		<tbody>
+		{{foreach $deleted as $u}}
+			<tr>
+				<td><img class="icon" 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.deleted}}</td>
+			</tr>
+		{{/foreach}}
+		</tbody>
+	</table>
+{{/if}}
+	<h2>{{$h_newuser}}</h2>
+	<form action="{{$baseurl}}/admin/users" method="post">
+		<input type="hidden" name="form_security_token" value="{{$form_security_token}}">
+		<table id="users">
+			<tbody>
+			<tr>
+				<td>{{include file="field_input.tpl" field=$newusername}}</td>
+			</tr>
+			<tr>
+				<td>{{include file="field_input.tpl" field=$newusernickname}}</td>
+			</tr>
+			<tr>
+				<td>{{include file="field_input.tpl" field=$newuseremail}}</td>
+			</tr>
+			</tbody>
+		</table>
+		<div class="submit"><input type="submit" name="add_new_user_submit" value="{{$submit}}"/></div>
+	</form>
 </div>
diff --git a/view/theme/frio/css/mod_admin.css b/view/theme/frio/css/mod_admin.css
index 76056d4a1..84a42ad6d 100644
--- a/view/theme/frio/css/mod_admin.css
+++ b/view/theme/frio/css/mod_admin.css
@@ -1,6 +1,5 @@
 
 #admin-users.adminpage > h1 { padding: 0 15px; }
-#admin-users.adminpage .panel-collapse { margin-left: -15px; margin-right: -15px; }
 
 #adminpage.adminpage > h1 { padding: 0 15px; }
 
@@ -18,5 +17,8 @@ tr.details th {
     border-top: 0!important;
 }
 
-.adminpage td > .checkbox { margin: 0; }
+.adminpage td > .checkbox,
+.adminpage th > .checkbox {
+	margin: 0;
+}
 .adminpage td { word-break: break-all; }
\ No newline at end of file
diff --git a/view/theme/frio/templates/admin/users.tpl b/view/theme/frio/templates/admin/users.tpl
index a9c5f003e..71d363862 100644
--- a/view/theme/frio/templates/admin/users.tpl
+++ b/view/theme/frio/templates/admin/users.tpl
@@ -18,26 +18,31 @@
 				**
 			-->
 			<div class="panel">
-				<div class="section-subtitle-wrapper" role="tab" id="admin-settings-pending">
-					<h4>
+				<div class="section-subtitle-wrapper panel-heading" role="tab" id="admin-settings-pending">
+					<h2>
 						<a class="accordion-toggle collapsed" data-toggle="collapse" data-parent="#admin-settings" href="#admin-settings-pending-collapse" aria-expanded="{{if count($pending) > 0}}true{{else}}false{{/if}}" aria-controls="admin-settings-pending-collapse">
 							{{$h_pending}} ({{count($pending)}})
 						</a>
-					</h4>
+					</h2>
 				</div>
 
 				<div id="admin-settings-pending-collapse" class="panel-collapse collapse {{if count($pending) > 0}}in{{/if}}" role="tabpanel" aria-labelledby="admin-settings-pending">
-					{{if $pending}}
+				{{if $pending}}
 					<table id="pending" class="table table-hover">
 						<thead>
 							<tr>
-								<th></th>
+								<th>
+									<div class="checkbox">
+										<input type="checkbox" id="admin-settings-pending-select" class="selecttoggle" data-select-class="pending_ckbx"/>
+										<label for="admin-settings-pending-select"></label>
+									</div>
+								</th>
 								{{foreach $th_pending as $th}}<th>{{$th}}</th>{{/foreach}}
 								<th></th>
 							</tr>
 						</thead>
 						<tbody>
-						{{foreach $pending as $u}}
+					{{foreach $pending as $u}}
 							<tr>
 								<td>
 									<div class="checkbox">
@@ -53,37 +58,27 @@
 									<a href="{{$baseurl}}/admin/users/deny/{{$u.uid}}?t={{$form_security_token}}" class="admin-settings-action-link" title="{{$deny}}"><i class="fa fa-trash-o" aria-hidden="true"></i></a>
 								</td>
 							</tr>
-							{{if $u.note}}
+						{{if $u.note}}
 							<tr class="details">
 								<td></td>
 								<th>{{$pendingnotetext}}</th>
 								<td colspan="4">{{$u.note}}</td>
 							</tr>
-							{{/if}}
-						{{/foreach}}
+						{{/if}}
+					{{/foreach}}
 						</tbody>
 					</table>
 					<div class="panel-footer">
-						<div class="row">
-							<div class="col-xs-3 admin-settings-footer-elements">
-								<div class="checkbox">
-									<input type="checkbox" id="admin-settings-pending-select" class="selecttoggle" data-select-class="pending_ckbx"/>
-									<label for="admin-settings-pending-select"></label>
-								</div>
-							</div>
-							<div class="col-xs-9 admin-settings-footer-elements text-right">
-								<button type="submit" name="page_users_deny" value="1" class="btn btn-primary">
-									<i class="fa fa-trash-o" aria-hidden="true"></i> {{$deny}}
-								</button>
-								<button type="submit" name="page_users_approve" value="1" class="btn btn-warinig">
-									<i class="fa fa-check" aria-hidden="true"></i> {{$approve}}
-								</button>
-							</div>
-						</div>
+						<button type="submit" name="page_users_deny" value="1" class="btn btn-primary">
+							<i class="fa fa-trash-o" aria-hidden="true"></i> {{$deny}}
+						</button>
+						<button type="submit" name="page_users_approve" value="1" class="btn btn-warinig">
+							<i class="fa fa-check" aria-hidden="true"></i> {{$approve}}
+						</button>
 					</div>
-					{{else}}
+				{{else}}
 					<div class="panel-body text-center text-muted">{{$no_pending}}</div>
-					{{/if}}
+				{{/if}}
 				</div>
 			</div>
 
@@ -95,48 +90,52 @@
 				**
 			-->
 			<div class="panel">
-				<div class="section-subtitle-wrapper" role="tab" id="admin-settings-user">
-					<h4>
+				<div class="section-subtitle-wrapper panel-heading" role="tab" id="admin-settings-user">
+					<h2>
 						<a class="accordion-toggle collapsed" data-toggle="collapse" data-parent="#admin-settings" href="#admin-settings-user-collapse" aria-expanded="false" aria-controls="admin-settings-user-collapse">
 							{{$h_users}} ({{count($users)}})
 						</a>
-					</h4>
+					</h2>
 				</div>
 
 				<div id="admin-settings-user-collapse" class="panel-collapse collapse" role="tabpanel" aria-labelledby="admin-settings-user">
 
-					{{if $users}}
-					<div class="panel-body">
-						<table id="users" class="table table-hover">
-							<thead>
-								<tr>
-									<th></th>
-									<th></th>
-									{{foreach $th_users as $k=>$th}}
-										{{if $k < 2 || $order_users == $th.1 || ($k==5 && !in_array($order_users,[$th_users.2.1, $th_users.3.1, $th_users.4.1])) }}
-										<th class="th-{{$k}}">
-											<button type="button" data-order-url="{{$baseurl}}/admin/users/?o={{if $order_direction_users == "+"}}-{{/if}}{{$th.1}}" class="btn-link table-order">
-												{{if $order_users == $th.1}}
-													{{if $order_direction_users == "+"}}
-													&#8595;
-													{{else}}
-													&#8593;
-													{{/if}}
+				{{if $users}}
+					<table id="users" class="table table-hover">
+						<thead>
+							<tr>
+								<th>
+									<div class="checkbox">
+										<input type="checkbox" id="admin-settings-users-select" class="selecttoggle" data-select-class="users_ckbx"/>
+										<label for="admin-settings-users-select"></label>
+									</div>
+								</th>
+								<th></th>
+								{{foreach $th_users as $k=>$th}}
+									{{if $k < 2 || $order_users == $th.1 || ($k==5 && !in_array($order_users,[$th_users.2.1, $th_users.3.1, $th_users.4.1])) }}
+									<th class="th-{{$k}}">
+										<button type="button" data-order-url="{{$baseurl}}/admin/users/?o={{if $order_direction_users == "+"}}-{{/if}}{{$th.1}}" class="btn-link table-order">
+											{{if $order_users == $th.1}}
+												{{if $order_direction_users == "+"}}
+												&#8595;
 												{{else}}
-												&#8597;
+												&#8593;
 												{{/if}}
-												{{$th.0}}
-											</button>
-										</th>
-										{{/if}}
-									{{/foreach}}
-									<th></th>
-								</tr>
-							</thead>
-							<tbody>
-							{{foreach $users as $u}}
-								<tr id="user-{{$u.uid}}" class="{{if $u.blocked != 0}}blocked{{/if}}">
-									<td>
+											{{else}}
+											&#8597;
+											{{/if}}
+											{{$th.0}}
+										</button>
+									</th>
+									{{/if}}
+								{{/foreach}}
+								<th></th>
+							</tr>
+						</thead>
+						<tbody>
+						{{foreach $users as $u}}
+							<tr id="user-{{$u.uid}}" class="{{if $u.blocked != 0}}blocked{{/if}}">
+								<td>
 									{{if $u.is_deletable}}
 									<div class="checkbox">
 										<input type="checkbox" class="users_ckbx" id="id_user_{{$u.uid}}" name="user[]" value="{{$u.uid}}"/>
@@ -145,135 +144,121 @@
 									{{else}}
 									&nbsp;
 									{{/if}}
-									</td>
-									<td><img class="avatar-nano" src="{{$u.micro}}" title="{{$u.nickname}}"></td>
-									<td><a href="{{$u.url}}" title="{{$u.nickname}}"> {{$u.name}}</a></td>
-									<td>{{$u.email}}</td>
-									{{if $order_users == $th_users.2.1}}
-									<td>{{$u.register_date}}</td>
+								</td>
+								<td><img class="avatar-nano" src="{{$u.micro}}" title="{{$u.nickname}}"></td>
+								<td><a href="{{$u.url}}" title="{{$u.nickname}}"> {{$u.name}}</a></td>
+								<td>{{$u.email}}</td>
+							{{if $order_users == $th_users.2.1}}
+								<td>{{$u.register_date}}</td>
+							{{/if}}
+
+							{{if $order_users == $th_users.3.1}}
+								<td>{{$u.login_date}}</td>
+							{{/if}}
+
+							{{if $order_users == $th_users.4.1}}
+								<td>{{$u.lastitem_date}}</td>
+							{{/if}}
+
+							{{if !in_array($order_users,[$th_users.2.1, $th_users.3.1, $th_users.4.1]) }}
+								<td>
+									<i class="fa
+										{{if $u.page_flags_raw==0}}fa-user{{/if}}		{{* PAGE_NORMAL *}}
+										{{if $u.page_flags_raw==1}}fa-bullhorn{{/if}}		{{* PAGE_SOAPBOX *}}
+										{{if $u.page_flags_raw==2}}fa-users{{/if}}		{{* PAGE_COMMUNITY *}}
+										{{if $u.page_flags_raw==3}}fa-heart{{/if}}		{{* PAGE_FREELOVE *}}
+										{{if $u.page_flags_raw==4}}fa-rss{{/if}}		{{* PAGE_BLOG *}}
+										{{if $u.page_flags_raw==5}}fa-user-secret{{/if}}	{{* PAGE_PRVGROUP *}}
+										" title="{{$u.page_flags}}">
+									</i>
+									{{if $u.page_flags_raw==0 && $u.account_type_raw > 0}}
+									<i class="fa
+										{{if $u.account_type_raw==1}}fa-sitemap{{/if}}		{{* ACCOUNT_TYPE_ORGANISATION *}}
+										{{if $u.account_type_raw==2}}fa-newspaper-o{{/if}}	{{* ACCOUNT_TYPE_NEWS *}}
+										{{if $u.account_type_raw==3}}fa-comments{{/if}}		{{* ACCOUNT_TYPE_COMMUNITY *}}
+										" title="{{$u.account_type}}">
+									</i>
 									{{/if}}
+									{{if $u.is_admin}}<i class="fa fa-user-secret text-primary" title="{{$siteadmin}}"></i>{{/if}}
+									{{if $u.account_expired}}<i class="fa fa-clock-o text-warning" title="{{$accountexpired}}"></i>{{/if}}
+								</td>
+							{{/if}}
 
-									{{if $order_users == $th_users.3.1}}
-									<td>{{$u.login_date}}</td>
-									{{/if}}
+								<td class="text-right">
+									<button type="button" class="btn-link admin-settings-action-link" onclick="return details({{$u.uid}})"><span class="caret"></span></button>
+								</td>
+							</tr>
+							<tr id="user-{{$u.uid}}-detail" class=" details hidden {{if $u.blocked != 0}}blocked{{/if}}">
+								<td>&nbsp;</td>
+								<td colspan="4">
+								{{if $order_users != $th_users.2.1}}
+									<p>
+										<button type="button" data-order-url="{{$baseurl}}/admin/users/?o={{if $order_direction_users == "+"}}-{{/if}}{{$th_users.2.1}}" class="btn-link table-order">
+										&#8597; {{$th_users.2.0}}</button> : {{$u.register_date}}
+									</p>
+								{{/if}}
 
-									{{if $order_users == $th_users.4.1}}
-									<td>{{$u.lastitem_date}}</td>
-									{{/if}}
+								{{if $order_users != $th_users.3.1}}
+									<p>
+										<button type="button" data-order-url="{{$baseurl}}/admin/users/?o={{if $order_direction_users == "+"}}-{{/if}}{{$th_users.3.1}}" class="btn-link table-order">
+											&#8597; {{$th_users.3.0}}</button> : {{$u.login_date}}
+									</p>
+								{{/if}}
 
-									{{if !in_array($order_users,[$th_users.2.1, $th_users.3.1, $th_users.4.1]) }}
-									<td>
-										<i class="fa
-											{{if $u.page_flags_raw==0}}fa-user{{/if}}		{{* PAGE_NORMAL *}}
-											{{if $u.page_flags_raw==1}}fa-bullhorn{{/if}}		{{* PAGE_SOAPBOX *}}
-											{{if $u.page_flags_raw==2}}fa-users{{/if}}		{{* PAGE_COMMUNITY *}}
-											{{if $u.page_flags_raw==3}}fa-heart{{/if}}		{{* PAGE_FREELOVE *}}
-											{{if $u.page_flags_raw==4}}fa-rss{{/if}}		{{* PAGE_BLOG *}}
-											{{if $u.page_flags_raw==5}}fa-user-secret{{/if}}	{{* PAGE_PRVGROUP *}}
-											" title="{{$u.page_flags}}">
-										</i>
-										{{if $u.page_flags_raw==0 && $u.account_type_raw > 0}}
-										<i class="fa
-											{{if $u.account_type_raw==1}}fa-sitemap{{/if}}		{{* ACCOUNT_TYPE_ORGANISATION *}}
-											{{if $u.account_type_raw==2}}fa-newspaper-o{{/if}}	{{* ACCOUNT_TYPE_NEWS *}}
-											{{if $u.account_type_raw==3}}fa-comments{{/if}}		{{* ACCOUNT_TYPE_COMMUNITY *}}
-											" title="{{$u.account_type}}">
-										</i>
-										{{/if}}
-										{{if $u.is_admin}}<i class="fa fa-user-secret text-primary" title="{{$siteadmin}}"></i>{{/if}}
-										{{if $u.account_expired}}<i class="fa fa-clock-o text-warning" title="{{$accountexpired}}"></i>{{/if}}
-									</td>
-									{{/if}}
+								{{if $order_users != $th_users.4.1}}
+									<p>
+										<button type="button" data-order-url="{{$baseurl}}/admin/users/?o={{if $order_direction_users == "+"}}-{{/if}}{{$th_users.4.1}}" class="btn-link table-order">
+											&#8597; {{$th_users.4.0}}</button> : {{$u.lastitem_date}}
+									</p>
+								{{/if}}
 
-									<td class="text-right">
-										<button type="button" class="btn-link admin-settings-action-link" onclick="return details({{$u.uid}})"><span class="caret"></span></button>
-									</td>
-								</tr>
-								<tr id="user-{{$u.uid}}-detail" class=" details hidden {{if $u.blocked != 0}}blocked{{/if}}">
-									<td>&nbsp;</td>
-									<td colspan="4">
-										{{if $order_users != $th_users.2.1}}
-										<p>
-											<button type="button" data-order-url="{{$baseurl}}/admin/users/?o={{if $order_direction_users == "+"}}-{{/if}}{{$th_users.2.1}}" class="btn-link table-order">
-											&#8597; {{$th_users.2.0}}</button> : {{$u.register_date}}
-										</p>
-										{{/if}}
+								{{if in_array($order_users,[$th_users.2.1, $th_users.3.1, $th_users.4.1]) }}
+									<p>
+										<button type="button" data-order-url="{{$baseurl}}/admin/users/?o={{if $order_direction_users == "+"}}-{{/if}}{{$th_users.5.1}}" class="btn-link table-order">
+											&#8597; {{$th_users.5.0}}</button> : {{$u.page_flags}}{{if $u.page_flags_raw==0 && $u.account_type_raw > 0}}, {{$u.account_type}}{{/if}} {{if $u.is_admin}}({{$siteadmin}}){{/if}} {{if $u.account_expired}}({{$accountexpired}}){{/if}}
+									</p>
+								{{/if}}
 
-										{{if $order_users != $th_users.3.1}}
-										<p>
-											<button type="button" data-order-url="{{$baseurl}}/admin/users/?o={{if $order_direction_users == "+"}}-{{/if}}{{$th_users.3.1}}" class="btn-link table-order">
-												&#8597; {{$th_users.3.0}}</button> : {{$u.login_date}}
-										</p>
-										{{/if}}
-
-										{{if $order_users != $th_users.4.1}}
-										<p>
-											<button type="button" data-order-url="{{$baseurl}}/admin/users/?o={{if $order_direction_users == "+"}}-{{/if}}{{$th_users.4.1}}" class="btn-link table-order">
-												&#8597; {{$th_users.4.0}}</button> : {{$u.lastitem_date}}
-										</p>
-										{{/if}}
-
-										{{if in_array($order_users,[$th_users.2.1, $th_users.3.1, $th_users.4.1]) }}
-										<p>
-											<button type="button" data-order-url="{{$baseurl}}/admin/users/?o={{if $order_direction_users == "+"}}-{{/if}}{{$th_users.5.1}}" class="btn-link table-order">
-												&#8597; {{$th_users.5.0}}</button> : {{$u.page_flags}}{{if $u.page_flags_raw==0 && $u.account_type_raw > 0}}, {{$u.account_type}}{{/if}} {{if $u.is_admin}}({{$siteadmin}}){{/if}} {{if $u.account_expired}}({{$accountexpired}}){{/if}}
-										</p>
-										{{/if}}
-
-									</td>
-									<td class="text-right">
-										{{if $u.is_deletable}}
-											{{if $u.blocked}}
-										<a href="{{$baseurl}}/admin/users/unblock/{{$u.uid}}?t={{$form_security_token}}" class="admin-settings-action-link" title="{{$unblock}}">
-											<i class="fa fa-circle-o" aria-hidden="true"></i>
-										</a>
-											{{else}}
-										<a href="{{$baseurl}}/admin/users/block/{{$u.uid}}?t={{$form_security_token}}" class="admin-settings-action-link" title="{{$block}}">
-											<i class="fa fa-ban" aria-hidden="true"></i>
-										</a>
-											{{/if}}
-										<a href="{{$baseurl}}/admin/users/delete/{{$u.uid}}?t={{$form_security_token}}" class="admin-settings-action-link" title="{{$delete}}" onclick="return confirm_delete('{{$confirm_delete}}','{{$u.name}}')">
-											<i class="fa fa-trash" aria-hidden="true"></i>
-										</a>
-										{{else}}
-										&nbsp;
-										{{/if}}
-									</td>
-								</tr>
-							{{/foreach}}
-							</tbody>
-						</table>
-					</div>
-					{{else}}
-					<div class="panel-body text-center bg-danger">NO USERS?!?</div>
-					{{/if}}
+								</td>
+								<td class="text-right">
+							{{if $u.is_deletable}}
+								{{if $u.blocked}}
+									<a href="{{$baseurl}}/admin/users/unblock/{{$u.uid}}?t={{$form_security_token}}" class="admin-settings-action-link" title="{{$unblock}}">
+										<i class="fa fa-circle-o" aria-hidden="true"></i>
+									</a>
+								{{else}}
+									<a href="{{$baseurl}}/admin/users/block/{{$u.uid}}?t={{$form_security_token}}" class="admin-settings-action-link" title="{{$block}}">
+										<i class="fa fa-ban" aria-hidden="true"></i>
+									</a>
+								{{/if}}
+									<a href="{{$baseurl}}/admin/users/delete/{{$u.uid}}?t={{$form_security_token}}" class="admin-settings-action-link" title="{{$delete}}" onclick="return confirm_delete('{{$confirm_delete}}','{{$u.name}}')">
+										<i class="fa fa-trash" aria-hidden="true"></i>
+									</a>
+							{{else}}
+									&nbsp;
+							{{/if}}
+								</td>
+							</tr>
+						{{/foreach}}
+						</tbody>
+					</table>
 					<div class="panel-footer">
-						{{if $users}}
-						<div class="row">
-							<div class="col-xs-3 admin-settings-footer-elements">
-								<div class="checkbox">
-									<input type="checkbox" id="admin-settings-users-select" class="selecttoggle" data-select-class="users_ckbx"/>
-									<label for="admin-settings-users-select"></label>
-								</div>
-							</div>
-							<div class="col-xs-9 admin-settings-footer-elements text-right">
-								<button type="submit" name="page_users_block" value="1" class="btn btn-warning">
-									<i class="fa fa-ban" aria-hidden="true"></i> {{$block}}
-								</button>
-								<button type="submit" name="page_users_unblock" value="1" class="btn btn-default">
-									<i class="fa fa-circle-o" aria-hidden="true"></i> {{$unblock}}
-								</button>
-								<button type="submit" name="page_users_delete" value="1" class="btn btn-danger" onclick="return confirm_delete('{{$confirm_delete_multi}}')">
-									<i class="fa fa-trash" aria-hidden="true"></i> {{$delete}}
-								</button>
-							</div>
-						</div>
-						{{/if}}
+						<button type="submit" name="page_users_block" value="1" class="btn btn-warning">
+							<i class="fa fa-ban" aria-hidden="true"></i> {{$block}}
+						</button>
+						<button type="submit" name="page_users_unblock" value="1" class="btn btn-default">
+							<i class="fa fa-circle-o" aria-hidden="true"></i> {{$unblock}}
+						</button>
+						<button type="submit" name="page_users_delete" value="1" class="btn btn-danger" onclick="return confirm_delete('{{$confirm_delete_multi}}')">
+							<i class="fa fa-trash" aria-hidden="true"></i> {{$delete}}
+						</button>
 					</div>
+				{{else}}
+					<div class="panel-body text-center bg-danger">NO USERS?!?</div>
+				{{/if}}
 				</div>
 			</div>
 
-
 			<!--
 				**
 				*
@@ -283,12 +268,12 @@
 			-->
 			{{if $deleted}}
 			<div class="panel">
-				<div class="section-subtitle-wrapper" role="tab" id="admin-settings-deleted">
-					<h4>
+				<div class="section-subtitle-wrapper panel-heading" role="tab" id="admin-settings-deleted">
+					<h2>
 						<a class="accordion-toggle collapsed" data-toggle="collapse" data-parent="#admin-settings" href="#admin-settings-deleted-collapse" aria-expanded="false" aria-controls="admin-settings-deleted-collapse">
 							{{$h_deleted}} ({{count($deleted)}})
 						</a>
-					</h4>
+					</h2>
 				</div>
 
 				<div id="admin-settings-deleted-collapse" class="panel-collapse collapse" role="tabpanel" aria-labelledby="admin-settings-deleted">
@@ -328,12 +313,12 @@
 				**
 			-->
 			<div class="panel">
-				<div class="section-subtitle-wrapper" role="tab" id="admin-settings-new-user">
-					<h4>
+				<div class="section-subtitle-wrapper panel-heading" role="tab" id="admin-settings-new-user">
+					<h2>
 						<a class="accordion-toggle collapsed" data-toggle="collapse" data-parent="#admin-settings" href="#admin-settings-new-user-collapse" aria-expanded="false" aria-controls="admin-settings-new-user-collapse">
 							{{$h_newuser}}
 						</a>
-					</h4>
+					</h2>
 				</div>
 
 				<div id="admin-settings-new-user-collapse" class="panel-collapse collapse" role="tabpanel" aria-labelledby="admin-settings-new-user">
@@ -342,11 +327,9 @@
 						{{include file="field_input.tpl" field=$newusernickname}}
 						{{include file="field_input.tpl" field=$newuseremail}}
 					</div>
-					<div class="panel-footer text-right">
+					<div class="panel-footer">
 						<button type="submit" class="btn btn-primary">{{$submit}}</button>
 					</div>
-
-
 				</div>
 			</div>
 		</div>
diff --git a/view/theme/quattro/templates/admin/users.tpl b/view/theme/quattro/templates/admin/users.tpl
index bd4e63ec7..9057a53d2 100644
--- a/view/theme/quattro/templates/admin/users.tpl
+++ b/view/theme/quattro/templates/admin/users.tpl
@@ -1,77 +1,89 @@
-
 <script>
-	function confirm_delete(uname){
-		return confirm( "{{$confirm_delete}}".format(uname));
+	function confirm_delete(uname) {
+		return confirm("{{$confirm_delete}}".format(uname));
 	}
-	function confirm_delete_multi(){
+
+	function confirm_delete_multi() {
 		return confirm("{{$confirm_delete_multi}}");
 	}
-	function selectall(cls){
-		$("."+cls).attr('checked','checked');
+
+	function selectall(cls) {
+		$("." + cls).attr('checked', 'checked');
 		return false;
 	}
 </script>
-<div id='adminpage'>
+<div id="adminpage">
 	<h1>{{$title}} - {{$page}}</h1>
-	
+
 	<form action="{{$baseurl}}/admin/users" method="post">
-        <input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
-		
-		<h3>{{$h_pending}}</h3>
+		<input type="hidden" name="form_security_token" value="{{$form_security_token}}">
+
+		<h2>{{$h_pending}}</h2>
 		{{if $pending}}
-			<table id='pending'>
+			<table id="pending">
 				<thead>
 				<tr>
-					{{foreach $th_pending as $th}}<th>{{$th}}</th>{{/foreach}}
+				{{foreach $th_pending as $th}}
+					<th>{{$th}}</th>
+				{{/foreach}}
 					<th></th>
 					<th></th>
 				</tr>
 				</thead>
 				<tbody>
-			{{foreach $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[]" value="{{$u.hash}}" /></td>
-					<td class="tools">
-						<a href="{{$baseurl}}/admin/users/allow/{{$u.uid}}?t={{$form_security_token}}" title='{{$approve}}'><span class='icon like'></span></a>
-						<a href="{{$baseurl}}/admin/users/deny/{{$u.uid}}?t={{$form_security_token}}" title='{{$deny}}'><span class='icon dislike'></span></a>
-					</td>
-				</tr>
-				<tr>
-					<td class="pendingnote"><p><span>{{$pendingnotetext}}:</span> {{$u.note}}</p></td>
-				</tr>
-			{{/foreach}}
+				{{foreach $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[]" value="{{$u.hash}}"/>
+						</td>
+						<td class="tools">
+							<a href="{{$baseurl}}/admin/users/allow/{{$u.uid}}?t={{$form_security_token}}" title="{{$approve}}">
+								<span class="icon like"></span>
+							</a>
+							<a href="{{$baseurl}}/admin/users/deny/{{$u.uid}}?t={{$form_security_token}}" title="{{$deny}}">
+								<span class="icon dislike"></span>
+							</a>
+						</td>
+					</tr>
+					<tr>
+						<td class="pendingnote"><p><span>{{$pendingnotetext}}:</span> {{$u.note}}</p></td>
+					</tr>
+				{{/foreach}}
 				</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>			
+			<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>
 		{{/if}}
-	
-		<h3>{{$h_users}}</h3>
+
+		<h2>{{$h_users}}</h2>
 		{{if $users}}
-			<table id='users'>
+			<table id="users">
 				<thead>
 				<tr>
 					<th></th>
-					{{foreach $th_users as $th}}
+				{{foreach $th_users as $th}}
 					<th>
 						<a href="{{$baseurl}}/admin/users/?o={{if $order_direction_users == "+"}}-{{/if}}{{$th.1}}">
-							{{if $order_users == $th.1}}
-								{{if $order_direction_users == "+"}}
+						{{if $order_users == $th.1}}
+							{{if $order_direction_users == "+"}}
 								&#8595;
-								{{else}}
-								&#8593;
-								{{/if}}
 							{{else}}
-								&#8597;
+								&#8593;
 							{{/if}}
-						{{$th.0}}</a>
+						{{else}}
+							&#8597;
+						{{/if}}
+							{{$th.0}}
+						</a>
 					</th>
-					{{/foreach}}
+				{{/foreach}}
 					<th></th>
 					<th></th>
 				</tr>
@@ -79,23 +91,28 @@
 				<tbody>
 				{{foreach $users as $u}}
 					<tr>
-						<td><img class='icon' 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}} {{if $u.is_admin}}({{$siteadmin}}){{/if}} {{if $u.account_expired}}({{$accountexpired}}){{/if}}</td>
-						<td class="checkbox"> 
-						{{if $u.is_deletable}}
-							<input type="checkbox" class="users_ckbx" id="id_user_{{$u.uid}}" name="user[]" value="{{$u.uid}}"/></td>
-						{{else}}
-							&nbsp;
-						{{/if}}
+						<td><img class="icon" 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}} {{if $u.is_admin}}({{$siteadmin}}){{/if}} {{if $u.account_expired}}({{$accountexpired}}){{/if}}</td>
+						<td class="checkbox">
+							{{if $u.is_deletable}}
+							<input type="checkbox" class="users_ckbx" id="id_user_{{$u.uid}}" name="user[]" value="{{$u.uid}}"/>
+							{{else}}
+								&nbsp;
+							{{/if}}
+						</td>
 						<td class="tools">
 						{{if $u.is_deletable}}
-							<a href="{{$baseurl}}/admin/users/block/{{$u.uid}}?t={{$form_security_token}}" title='{{if $u.blocked}}{{$unblock}}{{else}}{{$block}}{{/if}}'><span class='icon {{if $u.blocked==0}}unlock{{else}}lock{{/if}}'></span></a>
-							<a href="{{$baseurl}}/admin/users/delete/{{$u.uid}}?t={{$form_security_token}}" title='{{$delete}}' onclick="return confirm_delete('{{$u.name}}')"><span class='icon delete'></span></a>
+							<a href="{{$baseurl}}/admin/users/block/{{$u.uid}}?t={{$form_security_token}}" title="{{if $u.blocked}}{{$unblock}}{{else}}{{$block}}{{/if}}">
+								<span class="icon {{if $u.blocked==0}}unlock{{else}}lock{{/if}}"></span>
+							</a>
+							<a href="{{$baseurl}}/admin/users/delete/{{$u.uid}}?t={{$form_security_token}}" title="{{$delete}}" onclick="return confirm_delete('{{$u.name}}')">
+								<span class="icon delete"></span>
+							</a>
 						{{else}}
 							&nbsp;
 						{{/if}}
@@ -104,56 +121,58 @@
 				{{/foreach}}
 				</tbody>
 			</table>
-			<div class='selectall'><a href='#' onclick="return selectall('users_ckbx');">{{$select_all}}</a></div>
+			<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}}" />
-				<input type="submit" name="page_users_unblock" value="{{$unblock}}" />
-				<input type="submit" name="page_users_delete" value="{{$delete}}" onclick="return confirm_delete_multi()" />
+				<input type="submit" name="page_users_block" value="{{$block}}"/>
+				<input type="submit" name="page_users_unblock" value="{{$unblock}}"/>
+				<input type="submit" name="page_users_delete" value="{{$delete}}" onclick="return confirm_delete_multi()"/>
 			</div>
 		{{else}}
 			NO USERS?!?
 		{{/if}}
 	</form>
 	{{if $deleted}}
-		<h3>{{$h_deleted}}</h3>
-			<table id='deleted'>
-				<thead>
+		<h2>{{$h_deleted}}</h2>
+		<table id="deleted">
+			<thead>
+			<tr>
+				<th></th>
+			{{foreach $th_deleted as $th}}
+				<th>{{$th}}</th>
+			{{/foreach}}
+			</tr>
+			</thead>
+			<tbody>
+			{{foreach $deleted as $u}}
 				<tr>
-					<th></th>
-					{{foreach $th_deleted as $th}}<th>{{$th}}</th>{{/foreach}}
+					<td><img class="icon" 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.deleted}}</td>
 				</tr>
-				</thead>
-				<tbody>
-				{{foreach $deleted as $u}}
-					<tr>
-						<td><img class='icon' 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.deleted}}</td>
-					</tr>
-				{{/foreach}}
-				</tbody>
-			</table>
-		{{/if}}
-  <h3>{{$h_newuser}}</h3> 
-  <form action="{{$baseurl}}/admin/users" method="post"> 
-  <input type='hidden' name='form_security_token' value='{{$form_security_token}}'> 
-  <table id='users'> 
-      <tbody> 
-        <tr> 
-        <td>{{include file="field_input.tpl" field=$newusername}}</td> 
-    </tr> 
-        <tr> 
-        <td>{{include file="field_input.tpl" field=$newusernickname}}</td> 
-    </tr> 
-        <tr> 
-        <td>{{include file="field_input.tpl" field=$newuseremail}}</td> 
-    </tr> 
-      </tbody> 
-  </table> 
-  <div class="submit"><input type="submit" name="add_new_user_submit" value="{{$submit}}" /></div>             
-  </form>
+			{{/foreach}}
+			</tbody>
+		</table>
+	{{/if}}
+	<h2>{{$h_newuser}}</h2>
+	<form action="{{$baseurl}}/admin/users" method="post">
+		<input type="hidden" name="form_security_token" value="{{$form_security_token}}">
+		<table id="users">
+			<tbody>
+			<tr>
+				<td>{{include file="field_input.tpl" field=$newusername}}</td>
+			</tr>
+			<tr>
+				<td>{{include file="field_input.tpl" field=$newusernickname}}</td>
+			</tr>
+			<tr>
+				<td>{{include file="field_input.tpl" field=$newuseremail}}</td>
+			</tr>
+			</tbody>
+		</table>
+		<div class="submit"><input type="submit" name="add_new_user_submit" value="{{$submit}}"/></div>
+	</form>
 </div>