diff --git a/core/components/com_developer/admin/views/applications/tmpl/edit.php b/core/components/com_developer/admin/views/applications/tmpl/edit.php
index f66f7f64a1d..fdc3ccc217c 100644
--- a/core/components/com_developer/admin/views/applications/tmpl/edit.php
+++ b/core/components/com_developer/admin/views/applications/tmpl/edit.php
@@ -114,7 +114,7 @@
 						<?php
 						// get team and format for autocompletor
 						$currentTeam = array();
-						foreach ($this->row->team() as $member)
+						foreach ($this->row->team()->rows() as $member)
 						{
 							$profile = \Hubzero\User\User::oneOrNew($member->get('uidNumber'));
 
diff --git a/core/components/com_developer/site/controllers/applications.php b/core/components/com_developer/site/controllers/applications.php
index 5a1293b0433..019768d2ea6 100644
--- a/core/components/com_developer/site/controllers/applications.php
+++ b/core/components/com_developer/site/controllers/applications.php
@@ -55,10 +55,22 @@ public function displayTask()
 			return;
 		}
 
+		$memberships = Member::all()
+			->whereEquals('uidNumber', User::get('id'))
+			->rows();
+
+		$apps = array();
+		foreach ($memberships as $membership)
+		{
+			$apps[] = $membership->application_id;
+		}
+
 		// get developers apps
 		$applications = Application::all()
-			->whereEquals('created_by', User::get('id'))
-			->whereIn('state', array(0,1))
+			->whereEquals('created_by', User::get('id'), 1)
+			->orWhereIn('id', $apps, 1)
+			->resetDepth()
+			->whereIn('state', array(0, 1))
 			->rows();
 
 		// get developers authorized apps
diff --git a/core/components/com_developer/site/views/applications/tmpl/details.php b/core/components/com_developer/site/views/applications/tmpl/details.php
index 6160ee08a4c..3e73fd07ffa 100644
--- a/core/components/com_developer/site/views/applications/tmpl/details.php
+++ b/core/components/com_developer/site/views/applications/tmpl/details.php
@@ -36,7 +36,7 @@
 	<hr />
 	<h3><?php echo Lang::txt('COM_DEVELOPER_API_APPLICATION_TEAM_MEMBERS'); ?></h3>
 	<?php
-		$team = $this->application->team();
+		$team = $this->application->team()->rows();
 		echo $this->view('_team')
 			->set('members', $team)
 			->set('cls', 'compact')
diff --git a/core/components/com_developer/site/views/applications/tmpl/edit.php b/core/components/com_developer/site/views/applications/tmpl/edit.php
index 75c81c49881..3e0ab4378dd 100644
--- a/core/components/com_developer/site/views/applications/tmpl/edit.php
+++ b/core/components/com_developer/site/views/applications/tmpl/edit.php
@@ -79,7 +79,7 @@
 						<label>
 							<?php echo Lang::txt('COM_DEVELOPER_API_APPLICATION_CURRENT_TEAM'); ?>:
 							<?php
-								$team = $this->application->team();
+								$team = $this->application->team()->rows();
 								echo $this->view('_team')
 										  ->set('members', $team)
 										  ->display();