diff --git a/cmd/drone-server/static/scripts/views/login.html b/cmd/drone-server/static/scripts/views/login.html
index d14fc597e..44e16719b 100644
--- a/cmd/drone-server/static/scripts/views/login.html
+++ b/cmd/drone-server/static/scripts/views/login.html
@@ -55,14 +55,13 @@
 		}
 	</style>
 
-<div ng-switch="error">
-  <div ng-switch-when="internal_error">Oops. There was an unexpected error. Please try again.</div>
-  <div ng-switch-when="user_not_found">There was an error authorizing your account.</div>
-  <div ng-switch-when="access_denied_org">Login is restricted to approved organization members only</div>
-  <div ng-switch-when="access_denied">Self-registration is disabled. Please contact the system admin to grant access.</div>
-</div>
-
 <a href="/authorize" target="_self" class="box">
 	<div class="logo"></div>
+	<div ng-switch="error" class="alert alert-error" ng-if="error">
+	  <div ng-switch-when="internal_error">Oops. There was an unexpected error. Please try again.</div>
+	  <div ng-switch-when="user_not_found">There was an error authorizing your account.</div>
+	  <div ng-switch-when="access_denied_org">Login is restricted to approved organization members only</div>
+	  <div ng-switch-when="access_denied">Self-registration is disabled. Please contact the system admin to grant access.</div>
+	</div>
 	<div class="login">Login</div>
 </a>
diff --git a/cmd/drone-server/static/scripts/views/users.html b/cmd/drone-server/static/scripts/views/users.html
index 28a346b41..d0f0ee866 100644
--- a/cmd/drone-server/static/scripts/views/users.html
+++ b/cmd/drone-server/static/scripts/views/users.html
@@ -18,37 +18,31 @@
 		<table border="1">
 			<thead>
 				<tr>
+					<th></th>
 					<th>Login</th>
-					<th>Full Name</th>
-					<th>Created</th>
-					<th>Updated</th>
 					<th>Email</th>
-					<th>Site Admin</th>
-					<th>Gravatar</th>
+					<th>Admin</th>
 					<th></th>
 					<th></th>
 				</tr>
 			</thead>
 			<tbody>
 				<tr ng-repeat="user in users">
+					<td><img ng-src="{{ user.gravatar_id | gravatar }}" /></td>
 					<td>{{ user.login }}</td>
-					<td>{{ user.name }}</td>
-					<td>{{ user.created_at | fromNow }}</td>
-					<td>{{ user.updated_at | fromNow }}</td>
 					<td>{{ user.email }}</td>
 					<td>{{ !!user.admin }}</td>
-					<td><img ng-src="{{ user.gravatar_id | gravatar }}" /></td>
 					<td><button ng-click="toggle(user)">toggle admin</button></td>
 					<td><button ng-click="remove(user)">delete</button></td>
 				</tr>
 			</tbody>
 		</table>
 	</section>
-	
+
 	<section>
 		<form>
 			<input type="text" ng-model="login" />
 			<button ng-click="add(login)">Add</button>
 		</form>
 	</section>
-</article>
\ No newline at end of file
+</article>