diff --git a/contrib/tag_editcloud/main.php b/contrib/tag_editcloud/main.php
index 71dabc9e..233dcf68 100644
--- a/contrib/tag_editcloud/main.php
+++ b/contrib/tag_editcloud/main.php
@@ -123,9 +123,9 @@ class TagEditCloud extends Extension {
 	private function can_tag($image) {
 		global $config, $user;
 		return (
-			($config->get_bool("tag_edit_anon") || !$user->is_anonymous()) &&
-			($user->is_admin() || !$image->is_locked())
-			);
+			$user->can("edit_image_tag") &&
+			(!$image->is_locked() || $user->can("edit_image_lock"))
+		);
 	}
 
 }
diff --git a/contrib/tag_history/main.php b/contrib/tag_history/main.php
index 7c738f1f..33bd5826 100644
--- a/contrib/tag_history/main.php
+++ b/contrib/tag_history/main.php
@@ -28,7 +28,7 @@ class Tag_History extends Extension {
 
 		if($event->page_matches("tag_history/revert")) {
 			// this is a request to revert to a previous version of the tags
-			if($config->get_bool("tag_edit_anon") || !$user->is_anonymous()) {
+			if($user->can("edit_image_tag")) {
 				if(isset($_POST['revert'])) {
 					$this->process_revert_request($_POST['revert']);
 				}