diff --git a/models/Asset.php b/models/Asset.php
index 7b46c25..f1ddec6 100644
--- a/models/Asset.php
+++ b/models/Asset.php
@@ -234,6 +234,11 @@ class Asset
 		return $this->id_asset;
 	}
 
+	public function getAuthor()
+	{
+		return Member::fromId($this->id_user_uploaded);
+	}
+
 	public function getDateCaptured()
 	{
 		return $this->date_captured;
diff --git a/templates/PhotoPage.php b/templates/PhotoPage.php
index 470839f..2aa6f04 100644
--- a/templates/PhotoPage.php
+++ b/templates/PhotoPage.php
@@ -96,9 +96,13 @@ class PhotoPage extends SubTemplate
 						<dt>Date Taken</dt>
 						<dd>', date("j M Y, H:i:s", $this->exif->created_timestamp), '</dd>';
 
+		echo '
+						<dt>Uploaded by</dt>
+						<dd>', $this->photo->getAuthor()->getfullName(), '</dd>';
+
 		if (!empty($this->exif->camera))
 			echo '
-						<dt>Model</dt>
+						<dt>Camera Model</dt>
 						<dd>', $this->exif->camera, '</dd>';
 
 		if (!empty($this->exif->shutter_speed))