diff --git a/application/views/user/add.php b/application/views/user/add.php
index 8a21f51e1..44a3f99a7 100644
--- a/application/views/user/add.php
+++ b/application/views/user/add.php
@@ -1,22 +1,34 @@
 <h2>Add user</h2>
 <div class="wrap_content user">
+<?php if($this->session->flashdata('notice')) { ?>
+    <div id="message" >
+        <?php echo $this->session->flashdata('notice'); ?>
+    </div>
+<?php } ?>
+
 <?php echo validation_errors(); ?>
 
 <form method="post" action="<?php echo site_url('user/add'); ?>" name="users">
 <table>
 	<tr>
 		<td>Username</td>
-		<td><input type="text" name="user_name" value="<?php if(isset($user_name)) { echo $user_name; } ?>" /></td>
+		<td><input type="text" name="user_name" value="<?php if(isset($user_name)) { echo $user_name; } ?>" />
+		<?php if(isset($username_error)) { echo "<div class=\"small error\">".$username_error."</div>"; } ?>
+		</td>
 	</tr>
 	
 	<tr>
 		<td>E-mail</td>
-		<td><input type="text" name="user_email" value="<?php if(isset($user_email)) { echo $user_email; } ?>" /></td>
+		<td><input type="text" name="user_email" value="<?php if(isset($user_email)) { echo $user_email; } ?>" />
+		<?php if(isset($email_error)) { echo "<div class=\"small error\">".$email_error."</div>"; } ?>
+		</td>
 	</tr>
 	
 	<tr>
 		<td>Password</td>
-		<td><input type="password" name="user_password" value="<?php if(isset($user_password)) { echo $user_password; } ?>" /></td>
+		<td><input type="password" name="user_password" value="<?php if(isset($user_password)) { echo $user_password; } ?>" />
+		<?php if(isset($password_error)) { echo "<div class=\"small error\">".$password_error."</div>"; } ?>
+		</td>
 	</tr>
 	
 	<tr>
diff --git a/application/views/user/edit.php b/application/views/user/edit.php
index 466bbb8f6..444dbea84 100644
--- a/application/views/user/edit.php
+++ b/application/views/user/edit.php
@@ -6,17 +6,24 @@
 <table>
 	<tr>
 		<td>Username</td>
-		<td><input type="text" name="user_name" value="<?php echo $user_name; ?>" /></td>
+		<td><input type="text" name="user_name" value="<?php if(isset($user_name)) { echo $user_name; } ?>" />
+		<?php if(isset($username_error)) { echo "<div class=\"small error\">".$username_error."</div>"; } ?>
+		</td>
 	</tr>
 	
 	<tr>
 		<td>E-mail</td>
-		<td><input type="text" name="user_email" value="<?php echo $user_email; ?>" /></td>
+		<td><input type="text" name="user_email" value="<?php if(isset($user_email)) { echo $user_email; } ?>" />
+		<?php if(isset($email_error)) { echo "<div class=\"small error\">".$email_error."</div>"; } ?>
+		</td>
 	</tr>
 	
 	<tr>
 		<td>Password</td>
-		<td><input type="password" name="user_password" /><br><div class="small">Leave blank to keep existing password</div></td>
+		<td><input type="password" name="user_password" />
+		<?php if(isset($password_error)) { echo "<div class=\"small error\">".$password_error."</div>"; } else { ?>
+		<div class="small">Leave blank to keep existing password</div></td>
+		<?php } ?>
 	</tr>
 	
 	<tr>
diff --git a/application/views/user/main.php b/application/views/user/main.php
index 66a4c0dda..e69df68e3 100644
--- a/application/views/user/main.php
+++ b/application/views/user/main.php
@@ -37,6 +37,7 @@
 			<td>User</td>
 			<td>E-mail</td>
 			<td>Type</td>
+			<td>Options</td>
 		</tr>
 
 		<?php
@@ -46,7 +47,8 @@
 		<?php  echo '<tr class="tr'.($i & 1).'">'; ?>
 			<td><a href="<?php echo site_url('user/edit')."/".$row->user_id; ?>"><?php echo $row->user_name; ?></a></td>
 			<td><?php echo $row->user_email; ?></td>
-			<td><?php echo $row->user_type; ?></td>
+			<td><?php $l = $this->config->item('auth_level'); echo $l[$row->user_type]; ?></td>
+			<td><a href="<?php echo site_url('user/delete')."/".$row->user_id; ?>">Delete</a></td>
 		</tr>
 		<?php $i++; } ?>
 	</table>