diff --git a/modules/api/v1/leaderboard.php b/modules/api/v1/leaderboard.php
index b131677..a67a2bd 100644
--- a/modules/api/v1/leaderboard.php
+++ b/modules/api/v1/leaderboard.php
@@ -27,7 +27,7 @@ class api_v1_leaderboard extends APIv1
 
 			if ($this->uid != $leaderboard['uid'])
 			{
-				throw new Exception('Leaderboard UID does not belong to you.');
+				throw new Exception('Leaderboard does not belong to you.');
 			}
 
 			// Sets up our key suffixes
diff --git a/modules/leaderboard/edit.php b/modules/leaderboard/edit.php
index bd3debf..9fc9207 100644
--- a/modules/leaderboard/edit.php
+++ b/modules/leaderboard/edit.php
@@ -1,14 +1,30 @@
 <?php
 
-class leaderboard_edit extends leaderboard_new
+class leaderboard_edit extends leaderboards
 {
 	public function __default()
 	{
-		// Looks up the leaderboard by UID
+		try
+		{
+			$return       = parent::__default();
+			$leaderboards = $return['leaderboards'];
 
-		// Checks that the leaderboard is owned by this user
+			if (!isset($_GET['uid']))
+			{
+				throw new Exception('Missing UID.');
+			}
 
-		// Returns the leaderboard
+			if (!isset($leaderboards[$_GET['uid']]))
+			{
+				throw new Exception('Leaderboard does not belong to you.');
+			}
+
+			return array('leaderboard' => $leaderboards[$_GET['uid']]);
+		}
+		catch (Exception $e)
+		{
+			exit($e->getMessage());
+		}
 	}
 }