diff --git a/client/lib/application/src/router.react.jsx b/client/lib/application/src/router.react.jsx
index 323189f3..324446da 100644
--- a/client/lib/application/src/router.react.jsx
+++ b/client/lib/application/src/router.react.jsx
@@ -206,10 +206,9 @@ class EditAppFormHandler extends React.Component {
 
     render() {
         const {applicationId} = this.props.params,
-              userAccounts = this.props.userStore.getUserCloudAccounts().map(a => a.name),
               userTeams = this.props.userStore.getUserTeams().map(t => t.id),
-              accountsAndTeams = new Set(userAccounts.concat(userTeams)),
               application = this.props.kioStore.getApplication(applicationId),
+              teamsAndPreviousValue = new Set([...userTeams, application.team_id]),
               applicationIds = this.props.kioStore.getApplications().map(a => a.id);
 
         return <ApplicationForm
@@ -219,7 +218,7 @@ class EditAppFormHandler extends React.Component {
                     kioActions={KIO_ACTIONS}
                     application={application}
                     applicationIds={applicationIds}
-                    userTeams={[...accountsAndTeams]} />
+                    userTeams={[...teamsAndPreviousValue].sort()} />
     }
 }
 EditAppFormHandler.isAllowed = function(routerState, state, [hasAuth]) {
@@ -239,8 +238,7 @@ EditAppFormHandler.fetchData = function(routerState, state) {
     return KIO_ACTIONS.fetchApplication(routerState.params.applicationId)
         .then(app => Promise.all([
             requireAuth(state, app.team_id, MAGNIFICENT_ACTIONS),
-            requireTeams(state, USER_ACTIONS),
-            requireAccounts(state, USER_ACTIONS)
+            requireTeams(state, USER_ACTIONS)
         ]));
 };
 var ConnectedEditAppFormHandler =
diff --git a/server/mocks/5000-kio.js b/server/mocks/5000-kio.js
index a1416d6f..d5db5c56 100644
--- a/server/mocks/5000-kio.js
+++ b/server/mocks/5000-kio.js
@@ -16,7 +16,7 @@ var applications = {
         subtitle: 'STUPS application registry',
         name: 'Kio',
         active: true,
-        team_id: 'stups',
+        team_id: 'stups-test',
         id: 'kio',
         required_approvers: 2,
         criticality_level: 3,