diff --git a/application/core/Admin/AuthenticationManager.php b/application/core/Admin/AuthenticationManager.php
index 0c205654..abf7f90e 100644
--- a/application/core/Admin/AuthenticationManager.php
+++ b/application/core/Admin/AuthenticationManager.php
@@ -206,7 +206,7 @@ class AuthenticationManager implements CallbackListener {
 	 * Get all connected Players with at least the given Auth Level
 	 *
 	 * @param int $authLevel
-	 * @return array
+	 * @return Player[]
 	 */
 	public function getConnectedAdmins($authLevel = self::AUTH_LEVEL_MODERATOR) {
 		$players = $this->maniaControl->playerManager->getPlayers();
@@ -237,12 +237,11 @@ class AuthenticationManager implements CallbackListener {
 	 * Get a List of all Admins
 	 *
 	 * @param int $authLevel
-	 * @return array null
+	 * @return Player[]
 	 */
 	public function getAdmins($authLevel = self::AUTH_LEVEL_MODERATOR) {
-		// TODO: return Player objects
 		$mysqli = $this->maniaControl->database->mysqli;
-		$query  = "SELECT * FROM `" . PlayerManager::TABLE_PLAYERS . "`
+		$query  = "SELECT `login` FROM `" . PlayerManager::TABLE_PLAYERS . "`
 				WHERE `authLevel` > " . $authLevel . "
 				ORDER BY `authLevel` DESC;";
 		$result = $mysqli->query($query);
@@ -252,7 +251,10 @@ class AuthenticationManager implements CallbackListener {
 		}
 		$admins = array();
 		while ($row = $result->fetch_object()) {
-			array_push($admins, $row);
+			$player = $this->maniaControl->playerManager->getPlayer($row->login, false);
+			if ($player) {
+				array_push($admins, $player);
+			}
 		}
 		$result->free();
 		return $admins;
@@ -341,7 +343,7 @@ class AuthenticationManager implements CallbackListener {
 	 * Get the PermissionLevelNameArray
 	 *
 	 * @param $authLevelNeeded
-	 * @return array
+	 * @return array[]
 	 */
 	private function getPermissionLevelNameArray($authLevelNeeded) {
 		switch ($authLevelNeeded) {
diff --git a/application/core/Players/PlayerManager.php b/application/core/Players/PlayerManager.php
index 0205bfcc..77fb3680 100644
--- a/application/core/Players/PlayerManager.php
+++ b/application/core/Players/PlayerManager.php
@@ -384,7 +384,8 @@ class PlayerManager implements CallbackListener, TimerListener {
 	private function getPlayerFromDatabaseByLogin($playerLogin) {
 		$mysqli = $this->maniaControl->database->mysqli;
 
-		$query  = "SELECT * FROM `" . self::TABLE_PLAYERS . "` WHERE `login` LIKE '" . $mysqli->escape_string($playerLogin) . "';";
+		$query  = "SELECT * FROM `" . self::TABLE_PLAYERS . "`
+				WHERE `login` LIKE '" . $mysqli->escape_string($playerLogin) . "';";
 		$result = $mysqli->query($query);
 		if (!$result) {
 			trigger_error($mysqli->error);