diff --git a/core/userclass.class.php b/core/userclass.class.php
index d7e5616b..a8a5a66e 100644
--- a/core/userclass.class.php
+++ b/core/userclass.class.php
@@ -62,6 +62,7 @@ new UserClass("base", null, array(
 
 	"edit_user_password" => False,
 	"edit_user_info" => False,  # email address, etc
+	"edit_user_class" => False,
 	"delete_user" => False,
 
 	"create_comment" => False,
@@ -122,6 +123,7 @@ new UserClass("admin", "base", array(
 	"ban_ip" => True,
 	"edit_user_password" => True,
 	"edit_user_info" => True,
+	"edit_user_class" => True,
 	"delete_user" => True,
 	"create_image" => True,
 	"delete_image" => True,
diff --git a/ext/user/theme.php b/ext/user/theme.php
index 44a65555..f129d284 100644
--- a/ext/user/theme.php
+++ b/ext/user/theme.php
@@ -187,9 +187,10 @@ class UserPageTheme extends Themelet {
 			</form>
 			";
 
-			if($user->class->name == "admin") {
+			$i_user_id = int_escape($duser->id);
+
+			if($user->can("edit_user_class")) {
 				global $_user_classes;
-				$i_user_id = int_escape($duser->id);
 				$class_html = "";
 				foreach($_user_classes as $name => $values) {
 					$h_name = html_escape($name);
@@ -206,7 +207,11 @@ class UserPageTheme extends Themelet {
 							<tfoot><tr><td><input type='submit' value='Set'></td></tr></tfoot>
 						</table>
 					</form>
-					
+				";
+			}
+
+			if($user->can("delete_user")) {
+				$html .= "
 					<p>".make_form(make_link("user_admin/delete_user"))."
 						<input type='hidden' name='id' value='$i_user_id'>
 						<table style='width: 300px;'>