diff --git a/www/artworks/get.php b/www/artworks/get.php
index bed50f80..efbb8eea 100644
--- a/www/artworks/get.php
+++ b/www/artworks/get.php
@@ -8,13 +8,14 @@ $exception = $_SESSION['exception'] ?? null;
 
 try{
 	$artwork = Artwork::GetByUrl(HttpInput::Str(GET, 'artist-url-name'), HttpInput::Str(GET, 'artwork-url-name'));
-	$isAdminView = $GLOBALS['User']->Benefits->CanReviewArtwork ?? false;
+	$isReviewerView = $GLOBALS['User']->Benefits->CanReviewArtwork ?? false;
+	$isAdminView = $GLOBALS['User']->Benefits->CanReviewOwnArtwork ?? false;
 
 	// If the artwork is not approved, and we're not an admin or the submitter when they can edit, don't show it.
 	if(
 		($GLOBALS['User'] === null && $artwork->Status != ArtworkStatus::Approved)
 		||
-		($GLOBALS['User'] !== null && $artwork->SubmitterUserId != $GLOBALS['User']->UserId && !$isAdminView)
+		($GLOBALS['User'] !== null && $artwork->SubmitterUserId != $GLOBALS['User']->UserId && !$isReviewerView)
 	){
 		throw new Exceptions\InvalidPermissionsException();
 	}
@@ -69,12 +70,12 @@ catch(Exceptions\InvalidPermissionsException){
 		<table class="artwork-metadata">
 			<tr>
 				<td>Title</td>
-				<td><i><?= Formatter::EscapeHtml($artwork->Name) ?></i></td>
+				<td><i><?= Formatter::EscapeHtml($artwork->Name) ?></i><? if($isAdminView){ ?> (#<?= $artwork->ArtworkId ?>)<? } ?></td>
 			</tr>
 			<tr>
 				<td>Artist</td>
 				<td>
-					<?= Formatter::EscapeHtml($artwork->Artist->Name) ?><? if(sizeof($artwork->Artist->AlternateNames) > 0){ ?> (A.K.A. <span class="author" typeof="schema:Person" property="schema:name"><?= implode('</span>, <span class="author" typeof="schema:Person" property="schema:name">', array_map('Formatter::EscapeHtml', $artwork->Artist->AlternateNames)) ?></span>)<? } ?><? if($artwork->Artist->DeathYear !== null){ ?> (<abbr>d.</abbr> <?= $artwork->Artist->DeathYear ?>)<? } ?>
+					<?= Formatter::EscapeHtml($artwork->Artist->Name) ?><? if(sizeof($artwork->Artist->AlternateNames) > 0){ ?> (A.K.A. <span class="author" typeof="schema:Person" property="schema:name"><?= implode('</span>, <span class="author" typeof="schema:Person" property="schema:name">', array_map('Formatter::EscapeHtml', $artwork->Artist->AlternateNames)) ?></span>)<? } ?><? if($artwork->Artist->DeathYear !== null){ ?> (<abbr>d.</abbr> <?= $artwork->Artist->DeathYear ?>)<? } ?><? if($isAdminView){ ?> (#<?= $artwork->Artist->ArtistId ?>)<? } ?>
 				</td>
 			</tr>
 			<tr>
@@ -93,15 +94,15 @@ catch(Exceptions\InvalidPermissionsException){
 				<td>Status</td>
 				<td><?= Template::ArtworkStatus(['artwork' => $artwork]) ?></td>
 			</tr>
-			<? if($isAdminView){ ?>
+			<? if($isReviewerView){ ?>
 				<tr>
 					<td>Submitted by</td>
-					<td><? if($artwork->Submitter === null){ ?>Anonymous<? }else{ ?><a href="mailto:<?= Formatter::EscapeHtml($artwork->Submitter->Email) ?>"><? if($artwork->Submitter->Name !== null){ ?> <?= Formatter::EscapeHtml($artwork->Submitter->Name) ?><? }else{ ?><?= Formatter::EscapeHtml($artwork->Submitter->Email) ?><? } ?></a><? } ?></td>
+					<td><? if($artwork->Submitter === null){ ?>Anonymous<? }else{ ?><a href="mailto:<?= Formatter::EscapeHtml($artwork->Submitter->Email) ?>"><? if($artwork->Submitter->Name !== null){ ?> <?= Formatter::EscapeHtml($artwork->Submitter->Name) ?><? }else{ ?><?= Formatter::EscapeHtml($artwork->Submitter->Email) ?><? } ?></a><? } ?><? if($isAdminView && $artwork->Submitter !== null){ ?> (#<?= $artwork->Submitter->UserId ?>)<? } ?></td>
 				</tr>
 				<? if($artwork->Reviewer !== null){ ?>
 					<tr>
 						<td>Reviewed by</td>
-						<td><a href="mailto:<?= Formatter::EscapeHtml($artwork->Reviewer->Email) ?>"><? if($artwork->Reviewer->Name !== null){ ?> <?= Formatter::EscapeHtml($artwork->Reviewer->Name) ?><? }else{ ?><?= Formatter::EscapeHtml($artwork->Reviewer->Email) ?><? } ?></a></td>
+						<td><a href="mailto:<?= Formatter::EscapeHtml($artwork->Reviewer->Email) ?>"><? if($artwork->Reviewer->Name !== null){ ?> <?= Formatter::EscapeHtml($artwork->Reviewer->Name) ?><? }else{ ?><?= Formatter::EscapeHtml($artwork->Reviewer->Email) ?><? } ?></a><? if($isAdminView){ ?> (#<?= $artwork->Reviewer->UserId ?>)<? } ?></td>
 					</tr>
 				<? } ?>
 			<? } ?>
diff --git a/www/artworks/index.php b/www/artworks/index.php
index 6dde0d13..cf1f865c 100644
--- a/www/artworks/index.php
+++ b/www/artworks/index.php
@@ -10,9 +10,9 @@ $totalArtworkCount = 0;
 $pageDescription = '';
 $pageTitle = '';
 $queryString = '';
-$isAdminView = $GLOBALS['User']?->Benefits?->CanReviewArtwork ?? false;
+$isReviewerView = $GLOBALS['User']?->Benefits?->CanReviewArtwork ?? false;
 $submitterUserId = $GLOBALS['User']?->Benefits?->CanUploadArtwork ? $GLOBALS['User']->UserId : null;
-$isSubmitterView = !$isAdminView && $submitterUserId !== null;
+$isSubmitterView = !$isReviewerView && $submitterUserId !== null;
 
 if($page <= 0){
 	$page = 1;
@@ -32,7 +32,7 @@ if($sort == 'created-newest'){
 	$sort = null;
 }
 
-if($isAdminView){
+if($isReviewerView){
 	if($status == 'all' || $status === null){
 		$filterArtworkStatus = 'all-admin';
 	}
@@ -47,12 +47,12 @@ if($isSubmitterView){
 	}
 }
 
-if(!$isAdminView && !$isSubmitterView && !in_array($status, array('all', ArtworkStatus::Approved->value, 'in-use'))){
+if(!$isReviewerView && !$isSubmitterView && !in_array($status, array('all', ArtworkStatus::Approved->value, 'in-use'))){
 	$status = ArtworkStatus::Approved->value;
 	$filterArtworkStatus = $status;
 }
 
-if($isAdminView && !in_array($status, array('all', ArtworkStatus::Unverified->value, ArtworkStatus::Declined->value, ArtworkStatus::Approved->value, 'in-use'))
+if($isReviewerView && !in_array($status, array('all', ArtworkStatus::Unverified->value, ArtworkStatus::Declined->value, ArtworkStatus::Approved->value, 'in-use'))
                 && !in_array($filterArtworkStatus, array('all-admin', ArtworkStatus::Unverified->value, ArtworkStatus::Declined->value, ArtworkStatus::Approved->value, 'in-use'))){
 	$status = ArtworkStatus::Approved->value;
 	$filterArtworkStatus = $status;
@@ -103,8 +103,8 @@ if($perPage !== ARTWORK_PER_PAGE){
 				<span>
 					<select name="status" size="1">
 						<option value="all"<? if($status === null){ ?> selected="selected"<? } ?>>All</option>
-						<? if($isAdminView || $isSubmitterView){ ?><option value="<?= ArtworkStatus::Unverified->value ?>"<? if($status == ArtworkStatus::Unverified->value){ ?> selected="selected"<? } ?>>Unverified</option><? } ?>
-						<? if($isAdminView){ ?><option value="<?= ArtworkStatus::Declined->value ?>"<? if($status == ArtworkStatus::Declined->value){ ?> selected="selected"<? } ?>>Declined</option><? } ?>
+						<? if($isReviewerView || $isSubmitterView){ ?><option value="<?= ArtworkStatus::Unverified->value ?>"<? if($status == ArtworkStatus::Unverified->value){ ?> selected="selected"<? } ?>>Unverified</option><? } ?>
+						<? if($isReviewerView){ ?><option value="<?= ArtworkStatus::Declined->value ?>"<? if($status == ArtworkStatus::Declined->value){ ?> selected="selected"<? } ?>>Declined</option><? } ?>
 						<option value="<?= ArtworkStatus::Approved->value ?>"<? if($status == ArtworkStatus::Approved->value){ ?> selected="selected"<? } ?>>Approved, not in use</option>
 						<option value="in-use"<? if($status == 'in-use'){ ?> selected="selected"<? } ?>>In use</option>
 					</select>