diff --git a/kolibri/core/assets/src/api-resources/facilityTask.js b/kolibri/core/assets/src/api-resources/facilityTask.js
index 616b34ac5f4..09e2525bc77 100644
--- a/kolibri/core/assets/src/api-resources/facilityTask.js
+++ b/kolibri/core/assets/src/api-resources/facilityTask.js
@@ -17,4 +17,8 @@ export default new Resource({
   dataportalbulksync() {
     return this.postListEndpoint('startdataportalbulksync');
   },
+
+  deleteFinishedTasks() {
+    return this.postListEndpoint('deletefinishedtasks');
+  },
 });
diff --git a/kolibri/core/assets/src/mixins/commonSyncElements.js b/kolibri/core/assets/src/mixins/commonSyncElements.js
index 9e28e4e4078..83558b9ab71 100644
--- a/kolibri/core/assets/src/mixins/commonSyncElements.js
+++ b/kolibri/core/assets/src/mixins/commonSyncElements.js
@@ -1,4 +1,5 @@
-import { StaticNetworkLocationResource } from 'kolibri.resources';
+import some from 'lodash/some';
+import { StaticNetworkLocationResource, FacilityTaskResource } from 'kolibri.resources';
 import { createTranslator } from 'kolibri.utils.i18n';
 
 // Strings that might be shared among syncing-related UIs across plugins.
@@ -61,5 +62,24 @@ export default {
         nickname: device_name,
       }).save();
     },
+    startKdpSyncTask(facilityId) {
+      return FacilityTaskResource.dataportalsync(facilityId).then(response => {
+        return response.data;
+      });
+    },
+    fetchKdpSyncTasks() {
+      return FacilityTaskResource.fetchCollection({ force: true }).then(tasks => {
+        return tasks.filter(task => (task.type = 'SYNCDATAPORTAL'));
+      });
+    },
+    cleanupKdpSyncTasks(tasks, cb) {
+      if (some(tasks, { type: 'SYNCDATAPORTAL', status: 'COMPLETED' })) {
+        return FacilityTaskResource.deleteFinishedTasks().then(() => {
+          if (cb) {
+            cb();
+          }
+        });
+      }
+    },
   },
 };
diff --git a/kolibri/core/assets/src/views/sync/ConfirmationRegisterModal.vue b/kolibri/core/assets/src/views/sync/ConfirmationRegisterModal.vue
index 84645499b35..dcdbb8a9cca 100644
--- a/kolibri/core/assets/src/views/sync/ConfirmationRegisterModal.vue
+++ b/kolibri/core/assets/src/views/sync/ConfirmationRegisterModal.vue
@@ -2,7 +2,7 @@
 
   <KModal
     :title="$tr('registerFacility')"
-    :submitText="$tr('register')"
+    :submitText="registerText"
     :cancelText="cancelText"
     @submit="registerFacility"
     @cancel="$emit('cancel')"
@@ -56,6 +56,9 @@
           ? this.coreString('closeAction')
           : this.coreString('cancelAction');
       },
+      registerText() {
+        return this.alreadyRegistered ? null : this.$tr('register');
+      },
     },
     methods: {
       registerFacility() {
@@ -71,6 +74,7 @@
               data: { registered: true },
               exists: true,
             }).then(() => {
+              this.$emit('success', this.targetFacility);
               this.submitting = false;
             });
           })
diff --git a/kolibri/core/assets/src/views/sync/FacilityNameAndSyncStatus.vue b/kolibri/core/assets/src/views/sync/FacilityNameAndSyncStatus.vue
index d7cf0f2a523..ebfd174d0c0 100644
--- a/kolibri/core/assets/src/views/sync/FacilityNameAndSyncStatus.vue
+++ b/kolibri/core/assets/src/views/sync/FacilityNameAndSyncStatus.vue
@@ -21,7 +21,7 @@
     </div>
     <div>
       <span>
-        <template v-if="facility.syncing">
+        <template v-if="facility.syncing || isSyncing">
           <KCircularLoader class="loader" :size="16" :delay="false" />
           {{ $tr('syncing') }}
         </template>
@@ -46,18 +46,8 @@
 <script>
 
   import UiIcon from 'kolibri-design-system/lib/keen/UiIcon';
-  import has from 'lodash/has';
-  import every from 'lodash/every';
   import { now } from 'kolibri.utils.serverClock';
 
-  const facilityFields = [
-    'name',
-    'dataset.registered',
-    'syncing',
-    'last_sync_failed',
-    'last_synced',
-  ];
-
   export default {
     name: 'FacilityNameAndSyncStatus',
     components: {
@@ -68,9 +58,10 @@
       facility: {
         type: Object,
         required: true,
-        validator(value) {
-          return every(facilityFields, field => has(value, field));
-        },
+      },
+      isSyncing: {
+        type: Boolean,
+        default: false,
       },
     },
     data() {
diff --git a/kolibri/core/assets/src/views/sync/SelectAddressModalGroup/SelectAddressForm.vue b/kolibri/core/assets/src/views/sync/SelectAddressModalGroup/SelectAddressForm.vue
index 9f430b404c0..3d24076c0fa 100644
--- a/kolibri/core/assets/src/views/sync/SelectAddressModalGroup/SelectAddressForm.vue
+++ b/kolibri/core/assets/src/views/sync/SelectAddressModalGroup/SelectAddressForm.vue
@@ -48,7 +48,7 @@
             :disabled="!a.available || !a.hasContent"
           />
           <KButton
-            v-if="!readOnlyStaticAddrersses"
+            v-if="!hideSavedAddresses"
             :key="`forget-${idx}`"
             :text="$tr('forgetAddressButtonLabel')"
             appearance="basic-link"
@@ -57,7 +57,7 @@
         </div>
       </template>
 
-      <hr v-if="discoveredAddresses.length > 0">
+      <hr v-if="!hideSavedAddresses && discoveredAddresses.length > 0">
 
       <template v-for="d in discoveredAddresses">
         <div :key="`div-${d.id}`">
@@ -144,9 +144,8 @@
         required: false,
         default: '',
       },
-      // Customizes the component specifically for the PostSetupModalGroup
-      // Turns off: discovery + add new + forget
-      readOnlyStaticAddrersses: {
+      // Hides "New address" button and other saved locations
+      hideSavedAddresses: {
         type: Boolean,
         default: false,
       },
@@ -180,7 +179,7 @@
         );
       },
       newAddressButtonDisabled() {
-        return this.readOnlyStaticAddrersses || this.stage === this.Stages.FETCHING_ADDRESSES;
+        return this.hideSavedAddresses || this.stage === this.Stages.FETCHING_ADDRESSES;
       },
       requestsFailed() {
         return (
@@ -216,9 +215,7 @@
       },
     },
     beforeMount() {
-      if (!this.readOnlyStaticAddrersses) {
-        this.startDiscoveryPolling();
-      }
+      this.startDiscoveryPolling();
       return this.refreshSavedAddressList();
     },
     mounted() {
diff --git a/kolibri/core/assets/src/views/userAccounts/BirthYearDisplayText.vue b/kolibri/core/assets/src/views/userAccounts/BirthYearDisplayText.vue
index 82a5b4fd6fa..829a99fb3b7 100644
--- a/kolibri/core/assets/src/views/userAccounts/BirthYearDisplayText.vue
+++ b/kolibri/core/assets/src/views/userAccounts/BirthYearDisplayText.vue
@@ -1,7 +1,7 @@
 <template>
 
   <span v-if="isSpecified && birthYear">
-    {{ displayText }}
+    {{ birthYear }}
   </span>
   <KEmptyPlaceholder v-else />
 
diff --git a/kolibri/core/auth/test/test_api.py b/kolibri/core/auth/test/test_api.py
index dd360836fe8..112b0f58fe7 100644
--- a/kolibri/core/auth/test/test_api.py
+++ b/kolibri/core/auth/test/test_api.py
@@ -630,6 +630,51 @@ def test_user_list(self):
         )
 
 
+class FacilityUserFilterTestCase(APITestCase):
+    def setUp(self):
+        provision_device()
+        # Fixtures: 2 facilities with 1 learner + 1 admin each
+        self.facility_1 = FacilityFactory.create()
+        self.facility_2 = FacilityFactory.create()
+
+        self.user_1 = FacilityUserFactory.create(
+            facility=self.facility_1, username="learner_1"
+        )
+        self.admin_1 = FacilityUserFactory.create(
+            facility=self.facility_1, username="admin_1"
+        )
+        self.facility_1.add_admin(self.admin_1)
+
+        self.user_2 = FacilityUserFactory.create(
+            facility=self.facility_2, username="learner_2"
+        )
+        self.admin_2 = FacilityUserFactory.create(
+            facility=self.facility_2, username="admin_2"
+        )
+        self.facility_2.add_admin(self.admin_2)
+
+        # Superuser is in facility 1
+        self.superuser = create_superuser(self.facility_1, username="a_superuser")
+        self.client.login(
+            username=self.superuser.username,
+            password=DUMMY_PASSWORD,
+            facility=self.facility_1,
+        )
+
+    def _sort_by_username(self, data):
+        return sorted(data, key=lambda x: x["username"])
+
+    def test_user_member_of_filter(self):
+        response = self.client.get(
+            reverse("kolibri:core:facilityuser-list"), {"member_of": self.facility_1.id}
+        )
+        data = self._sort_by_username(response.data)
+        self.assertEqual(len(data), 3)
+        self.assertEqual(data[0]["id"], self.superuser.id)
+        self.assertEqual(data[1]["id"], self.admin_1.id)
+        self.assertEqual(data[2]["id"], self.user_1.id)
+
+
 class LoginLogoutTestCase(APITestCase):
     def setUp(self):
         provision_device()
diff --git a/kolibri/core/discovery/api.py b/kolibri/core/discovery/api.py
index ad44085688c..c52b4db200f 100644
--- a/kolibri/core/discovery/api.py
+++ b/kolibri/core/discovery/api.py
@@ -1,4 +1,6 @@
+import requests
 from rest_framework import viewsets
+from rest_framework.response import Response
 
 from .models import DynamicNetworkLocation
 from .models import NetworkLocation
@@ -20,3 +22,18 @@ class DynamicNetworkLocationViewSet(NetworkLocationViewSet):
 
 class StaticNetworkLocationViewSet(NetworkLocationViewSet):
     queryset = StaticNetworkLocation.objects.all()
+
+
+class NetworkLocationFacilitiesView(viewsets.GenericViewSet):
+    """
+    Given a NetworkLocation ID, returns a list of Facilities that are on
+    that NetworkLocation, for the purposes of syncing
+    """
+
+    def retrieve(self, request, pk=None):
+        base_url = "http://192.168.1.8:8000/"
+        facility_url = "{}api/public/v1/facility".format(base_url)
+        response = requests.get(facility_url)
+        response.raise_for_status()
+        facilities_data = response.json()
+        return Response(facilities_data)
diff --git a/kolibri/core/discovery/api_urls.py b/kolibri/core/discovery/api_urls.py
index c8627aeded8..1c93bce5d44 100644
--- a/kolibri/core/discovery/api_urls.py
+++ b/kolibri/core/discovery/api_urls.py
@@ -1,6 +1,7 @@
 from rest_framework import routers
 
 from .api import DynamicNetworkLocationViewSet
+from .api import NetworkLocationFacilitiesView
 from .api import NetworkLocationViewSet
 from .api import StaticNetworkLocationViewSet
 
@@ -18,4 +19,10 @@
     base_name="dynamicnetworklocation",
 )
 
+router.register(
+    r"networklocation_facilities",
+    NetworkLocationFacilitiesView,
+    basename="networklocation_facilities",
+)
+
 urlpatterns = router.urls
diff --git a/kolibri/plugins/coach/assets/src/views/common.js b/kolibri/plugins/coach/assets/src/views/common.js
index 9c1bbac1f13..bf8b79482aa 100644
--- a/kolibri/plugins/coach/assets/src/views/common.js
+++ b/kolibri/plugins/coach/assets/src/views/common.js
@@ -96,7 +96,7 @@ export const CoachCoreBase = {
         const { facility_id, name } = this.$store.state.classSummary;
         if (
           facility_id &&
-          this.$store.state.core.facilities.length > 0 &&
+          this.$store.state.core.facilities.length > 1 &&
           this.$store.getters.isSuperuser
         ) {
           const match = find(this.$store.state.core.facilities, { id: facility_id }) || {};
diff --git a/kolibri/plugins/device/assets/src/views/AvailableChannelsPage/index.vue b/kolibri/plugins/device/assets/src/views/AvailableChannelsPage/index.vue
index 2007c081f40..f986a83c1eb 100644
--- a/kolibri/plugins/device/assets/src/views/AvailableChannelsPage/index.vue
+++ b/kolibri/plugins/device/assets/src/views/AvailableChannelsPage/index.vue
@@ -204,7 +204,10 @@
       },
       multipleMode() {
         const { multiple } = this.$route.query;
-        return multiple === true || multiple === 'true';
+        return this.setupMode || multiple === true || multiple === 'true';
+      },
+      setupMode() {
+        return Boolean(this.$route.query.setup);
       },
       documentTitle() {
         switch (this.transferType) {
@@ -252,6 +255,13 @@
         this.setAppBarTitle(this.toolbarTitle(this.transferType));
       }
     },
+    mounted() {
+      // If arriving here from the PostSetupModalGroup/WelcomeModal,
+      // then select all the channels automatically
+      if (this.setupMode) {
+        this.selectedChannels = [...this.allChannels];
+      }
+    },
     methods: {
       ...mapMutations('coreBase', {
         setAppBarTitle: 'SET_APP_BAR_TITLE',
@@ -276,14 +286,16 @@
       toggleMultipleMode() {
         let newQuery;
         if (this.multipleMode) {
-          newQuery = omit(this.$route.query, ['multiple']);
+          // Remove the 'setup' query param if switching to single-channel mode.
+          // When the user returns, none of the channels will be selected
+          newQuery = omit(this.$route.query, ['multiple', 'setup']);
         } else {
           newQuery = {
             ...this.$route.query,
             multiple: true,
           };
         }
-        this.$router.push({ query: newQuery });
+        return this.$router.push({ query: newQuery });
       },
       handleSubmitToken(channel) {
         if (this.multipleMode) {
diff --git a/kolibri/plugins/device/assets/src/views/FacilitiesPage/SyncFacilityModalGroup.vue b/kolibri/plugins/device/assets/src/views/FacilitiesPage/SyncFacilityModalGroup.vue
index e5c282b408c..616c5927ce1 100644
--- a/kolibri/plugins/device/assets/src/views/FacilitiesPage/SyncFacilityModalGroup.vue
+++ b/kolibri/plugins/device/assets/src/views/FacilitiesPage/SyncFacilityModalGroup.vue
@@ -4,14 +4,14 @@
     <SelectSyncSourceModal
       v-if="atSelectSource"
       @submit="handleSubmit"
-      @cancel="$emit('cancel')"
+      @cancel="closeModal()"
     />
 
     <SelectAddressModalGroup
       v-else-if="atSelectAddress"
       :fetchAddressArgs="''"
       @submit="handleSubmit"
-      @cancel="$emit('cancel')"
+      @cancel="closeModal()"
     />
   </div>
 
@@ -25,8 +25,10 @@
   import { SelectAddressModalGroup } from 'kolibri.coreVue.componentSets.sync';
   import SelectSyncSourceModal from './SelectSyncSourceModal';
 
-  const SELECT_SOURCE = 'SELECT_SOURCE';
-  const SELECT_ADDRESS = 'SELECT_ADDRESS';
+  const Steps = Object.freeze({
+    SELECT_SOURCE: 'SELECT_SOURCE',
+    SELECT_ADDRESS: 'SELECT_ADDRESS',
+  });
 
   export default {
     name: 'SyncFacilityModalGroup',
@@ -35,25 +37,30 @@
       SelectAddressModalGroup,
     },
     mixins: [commonCoreStrings, commonSyncElements],
-    props: {},
+    props: {
+      facilityForSync: {
+        type: Object,
+        required: true,
+      },
+    },
     data() {
       return {
-        step: SELECT_SOURCE,
+        step: Steps.SELECT_SOURCE,
       };
     },
     computed: {
       atSelectSource() {
-        return this.step === SELECT_SOURCE;
+        return this.step === Steps.SELECT_SOURCE;
       },
       atSelectAddress() {
-        return this.step === SELECT_ADDRESS;
+        return this.step === Steps.SELECT_ADDRESS;
       },
     },
     methods: {
       handleSubmit(data) {
         if (this.atSelectSource) {
           if (data.source === 'PEER') {
-            this.step = SELECT_ADDRESS;
+            this.step = Steps.SELECT_ADDRESS;
           } else {
             this.startSync();
           }
@@ -61,9 +68,12 @@
           this.startSync();
         }
       },
+      closeModal() {
+        this.$emit('close');
+      },
       startSync() {
-        return Promise.resolve().then(() => {
-          this.$emit('cancel');
+        this.startKdpSyncTask(this.facilityForSync.id).then(task => {
+          this.$emit('success', task.id);
         });
       },
     },
diff --git a/kolibri/plugins/device/assets/src/views/FacilitiesPage/index.vue b/kolibri/plugins/device/assets/src/views/FacilitiesPage/index.vue
index d72608049fc..52a1aed4422 100644
--- a/kolibri/plugins/device/assets/src/views/FacilitiesPage/index.vue
+++ b/kolibri/plugins/device/assets/src/views/FacilitiesPage/index.vue
@@ -1,7 +1,6 @@
 <template>
 
   <div>
-
     <HeaderWithOptions :headerText="coreString('facilitiesLabel')">
       <template #options>
         <KButton
@@ -32,7 +31,10 @@
       <tbody slot="tbody">
         <tr v-for="(facility, idx) in facilities" :key="idx">
           <td>
-            <FacilityNameAndSyncStatus :facility="facility" />
+            <FacilityNameAndSyncStatus
+              :facility="facility"
+              :isSyncing="facilityIsSyncing(facility)"
+            />
           </td>
           <td class="button-col">
             <div>
@@ -54,7 +56,7 @@
 
     <RemoveFacilityModal
       v-if="Boolean(facilityForRemoval)"
-      :canRemove="facilityForRemoval.canRemove"
+      :canRemove="facilityCanBeRemoved(facilityForRemoval)"
       :facility="facilityForRemoval"
       @submit="handleSubmitRemoval"
       @cancel="facilityForRemoval = null"
@@ -72,16 +74,30 @@
       @cancel="showImportModal = false"
     />
 
-    <RegisterFacilityModal
-      v-if="Boolean(facilityForRegister)"
-      :facility="facilityForRegister"
-      @cancel="facilityForRegister = null"
-    />
+    <!-- NOTE similar code for KDP Registration in SyncInterface -->
+    <template v-if="Boolean(facilityForRegister)">
+      <RegisterFacilityModal
+        v-if="!kdpProject"
+        :facility="facilityForRegister"
+        @success="handleValidateSuccess"
+        @cancel="clearRegistrationState"
+      />
+
+      <ConfirmationRegisterModal
+        v-else
+        :targetFacility="facilityForRegister"
+        :projectName="kdpProject.name"
+        :token="kdpProject.token"
+        @success="handleConfirmationSuccess"
+        @cancel="clearRegistrationState"
+      />
+    </template>
 
     <SyncFacilityModalGroup
       v-if="Boolean(facilityForSync)"
-      @submit="facilityForSync = null"
-      @cancel="facilityForSync = null"
+      :facilityForSync="facilityForSync"
+      @close="facilityForSync = null"
+      @success="handleStartSyncSuccess"
     />
   </div>
 
@@ -91,18 +107,26 @@
 <script>
 
   import commonCoreStrings from 'kolibri.coreVue.mixins.commonCoreStrings';
+  import commonSyncElements from 'kolibri.coreVue.mixins.commonSyncElements';
   import CoreTable from 'kolibri.coreVue.components.CoreTable';
+  import { FacilityResource } from 'kolibri.resources';
   import {
     FacilityNameAndSyncStatus,
     RegisterFacilityModal,
+    ConfirmationRegisterModal,
   } from 'kolibri.coreVue.componentSets.sync';
-  import TasksBar from '../ManageContentPage/TasksBar.vue';
+  import TasksBar from '../ManageContentPage/TasksBar';
   import HeaderWithOptions from '../HeaderWithOptions';
   import RemoveFacilityModal from './RemoveFacilityModal';
   import SyncAllFacilitiesModal from './SyncAllFacilitiesModal';
   import SyncFacilityModalGroup from './SyncFacilityModalGroup';
   import ImportFacilityModalGroup from './ImportFacilityModalGroup';
 
+  const Options = Object.freeze({
+    REGISTER: 'REGISTER',
+    REMOVE: 'REMOVE',
+  });
+
   export default {
     name: 'FacilitiesPage',
     metaInfo() {
@@ -111,6 +135,7 @@
       };
     },
     components: {
+      ConfirmationRegisterModal,
       CoreTable,
       HeaderWithOptions,
       FacilityNameAndSyncStatus,
@@ -121,23 +146,19 @@
       SyncAllFacilitiesModal,
       TasksBar,
     },
-    mixins: [commonCoreStrings],
+    mixins: [commonCoreStrings, commonSyncElements],
     props: {},
     data() {
       return {
         showSyncAllModal: false,
         showImportModal: false,
+        facilities: [],
         facilityForSync: null,
         facilityForRemoval: null,
         facilityForRegister: null,
-        facilitiesTasks: [
-          {
-            status: 'COMPLETED',
-          },
-          {
-            status: 'RUNNING',
-          },
-        ],
+        kdpProject: null,
+        facilitiesTasks: [],
+        tasks: [],
       };
     },
     computed: {
@@ -145,73 +166,28 @@
         return [
           {
             label: this.coreString('registerAction'),
-            value: 'REGISTER',
+            value: Options.REGISTER,
           },
           {
             label: this.coreString('removeAction'),
-            value: 'REMOVE',
-          },
-        ];
-      },
-      facilities() {
-        return [
-          {
-            name: 'Atkinson Hall (d81c)',
-            id: 'D81C',
-            syncing: false,
-            dataset: {
-              registered: false,
-            },
-            last_sync_failed: false,
-            last_synced: null,
-            canRemove: true,
-          },
-          {
-            name: 'Atkinson Hall (d81c)',
-            id: 'D81C',
-            syncing: true,
-            dataset: {
-              registered: true,
-            },
-            last_sync_failed: false,
-            last_synced: null,
-            canRemove: true,
-          },
-          {
-            name: 'Atkinson Hall (d81c)',
-            id: 'D81C',
-            syncing: false,
-            dataset: {
-              registered: true,
-            },
-            last_sync_failed: false,
-            last_synced: 1588036798109,
-            canRemove: true,
+            value: Options.REMOVE,
           },
-          {
-            name: 'Atkinson Hall (d81c)',
-            id: 'D81C',
-            syncing: false,
-            dataset: {
-              registered: true,
-            },
-            last_sync_failed: true,
-            last_synced: 1588036798109,
-            canRemove: true,
-          },
-          // {
-          //   name: 'Cannot remove',
-          //   id: '4321',
-          //   canRemove: false,
-          // },
         ];
       },
     },
+    beforeMount() {
+      this.fetchFacilites();
+      this.pollSyncTasks();
+    },
     methods: {
+      facilityCanBeRemoved() {
+        // TODO return false if user is in the facility (determine from session)
+        return true;
+      },
       handleOptionSelect(option, facility) {
-        if (option === 'REMOVE') {
+        if (option === Options.REMOVE) {
           this.facilityForRemoval = facility;
-        } else if (option === 'REGISTER') {
+        } else if (option === Options.REGISTER) {
           this.facilityForRegister = facility;
         }
       },
@@ -227,9 +203,46 @@
           );
         }
       },
+      fetchFacilites() {
+        return FacilityResource.fetchCollection({ force: true }).then(facilities => {
+          this.facilities = [...facilities];
+        });
+      },
       handleClickClearAll() {
         this.facilitiesTasks = [];
       },
+      handleValidateSuccess({ name, token }) {
+        this.kdpProject = { name, token };
+      },
+      handleConfirmationSuccess() {
+        this.fetchFacilites();
+        this.clearRegistrationState();
+      },
+      clearRegistrationState() {
+        this.facilityForRegister = null;
+        this.kdpProject = null;
+      },
+      handleStartSyncSuccess() {
+        this.pollSyncTasks();
+        this.facilityForSync = null;
+      },
+      pollSyncTasks() {
+        this.fetchKdpSyncTasks()
+          .then(tasks => {
+            this.tasks = tasks;
+            return this.cleanupKdpSyncTasks(this.tasks, this.fetchFacilites);
+          })
+          .then(() => {
+            if (this.tasks.length > 0) {
+              setTimeout(() => {
+                return this.pollSyncTasks();
+              }, 2000);
+            }
+          });
+      },
+      facilityIsSyncing(facility) {
+        return Boolean(this.tasks.find(task => task.facility === facility.id));
+      },
     },
     $trs: {
       syncAllAction: {
diff --git a/kolibri/plugins/device/assets/src/views/ManageContentPage/SelectNetworkAddressModal/index.vue b/kolibri/plugins/device/assets/src/views/ManageContentPage/SelectNetworkAddressModal/index.vue
index e867efe56fe..845c3a720b0 100644
--- a/kolibri/plugins/device/assets/src/views/ManageContentPage/SelectNetworkAddressModal/index.vue
+++ b/kolibri/plugins/device/assets/src/views/ManageContentPage/SelectNetworkAddressModal/index.vue
@@ -40,7 +40,8 @@
       ...mapMutations('manageContent/wizard', {
         resetContentWizardState: 'RESET_STATE',
       }),
-      handleSelectAddressSubmit(addressId) {
+      handleSelectAddressSubmit(address) {
+        const addressId = address.id;
         if (this.manageMode) {
           this.$emit('submit', { addressId });
         } else {
diff --git a/kolibri/plugins/device/assets/src/views/PostSetupModalGroup.vue b/kolibri/plugins/device/assets/src/views/PostSetupModalGroup.vue
index 86ccb0afa1a..079880c2bae 100644
--- a/kolibri/plugins/device/assets/src/views/PostSetupModalGroup.vue
+++ b/kolibri/plugins/device/assets/src/views/PostSetupModalGroup.vue
@@ -11,9 +11,11 @@
       v-if="step === Steps.PERMISSIONS_CHANGE"
       newRole="superadmin"
     />
+
     <SelectAddressForm
       v-else-if="step === Steps.SELECT_SOURCE_FACILITY_PEER"
       :title="getCommonSyncString('selectSourceTitle')"
+      hideSavedAddresses
       @submit="handleSubmit"
       @cancel="$emit('cancel')"
     >
@@ -85,7 +87,10 @@
             this.$emit('cancel');
           }
         } else if (this.step === Steps.SELECT_SOURCE_FACILITY_PEER) {
-          this.$router.push(availableChannelsPageLink({ addressId: data.id }));
+          this.$emit('cancel');
+          let newRoute = availableChannelsPageLink({ addressId: data.id });
+          newRoute.query.setup = true;
+          this.$router.push(newRoute);
         }
       },
     },
diff --git a/kolibri/plugins/device/assets/src/views/SelectContentPage/ChannelContentsSummary.vue b/kolibri/plugins/device/assets/src/views/SelectContentPage/ChannelContentsSummary.vue
index fba10a82097..d6ee8b9a747 100644
--- a/kolibri/plugins/device/assets/src/views/SelectContentPage/ChannelContentsSummary.vue
+++ b/kolibri/plugins/device/assets/src/views/SelectContentPage/ChannelContentsSummary.vue
@@ -45,6 +45,9 @@
         <td>{{ $tr('resourceCount', { count: channel.on_device_resources || 0 }) }}</td>
         <td>{{ bytesForHumans(channel.on_device_file_size || 0) }}</td>
       </tr>
+      <tr v-if="false">
+        <th>{{ $tr('newOrUpdatedLabel') }}</th>
+      </tr>
     </table>
   </section>
 
@@ -89,6 +92,11 @@
       totalSizeRow: 'Total size',
       version: 'Version {version, number, integer}',
       unlistedChannelTooltip: 'Unlisted channel',
+      newOrUpdatedLabel: {
+        message: 'New or updated',
+        context:
+          'Table header for the number and size of resources that will be added to a channel after upgrading',
+      },
     },
   };
 
diff --git a/kolibri/plugins/device/assets/src/views/SelectContentPage/ChannelUpdateAnnotations.vue b/kolibri/plugins/device/assets/src/views/SelectContentPage/ChannelUpdateAnnotations.vue
new file mode 100644
index 00000000000..f1be0aec702
--- /dev/null
+++ b/kolibri/plugins/device/assets/src/views/SelectContentPage/ChannelUpdateAnnotations.vue
@@ -0,0 +1,51 @@
+<template>
+
+  <div>
+    <p v-if="false">
+      {{ $tr('newResource') }}
+    </p>
+    <p v-if="false">
+      {{ $tr('newResourcesInTopic') }}
+    </p>
+    <p v-if="false">
+      {{ $tr('inQueueForImport') }}
+    </p>
+  </div>
+
+</template>
+
+
+<script>
+
+  export default {
+    name: 'ChannelUpdateAnnotations',
+    components: {},
+    mixins: [],
+    props: {},
+    data() {
+      return {};
+    },
+    computed: {},
+    methods: {},
+    $trs: {
+      newResource: {
+        message: 'New',
+        context: 'Label that is shown with resources that were added after upgrading the channel',
+      },
+      newResourcesInTopic: {
+        message: '{count} {count, plural, one {new} other {new}}',
+        context:
+          'Label that is shown on topics with resources that were added after upgrading the channel',
+      },
+      inQueueForImport: {
+        message: 'In queue for import',
+        context:
+          'Label that is with resources that are not selectable for import since they are being re-downloaded after upgrading the channel',
+      },
+    },
+  };
+
+</script>
+
+
+<style lang="scss" scoped></style>
diff --git a/kolibri/plugins/device/assets/src/views/SelectContentPage/ContentNodeRow.vue b/kolibri/plugins/device/assets/src/views/SelectContentPage/ContentNodeRow.vue
index df7cc09d72b..133582651c6 100644
--- a/kolibri/plugins/device/assets/src/views/SelectContentPage/ContentNodeRow.vue
+++ b/kolibri/plugins/device/assets/src/views/SelectContentPage/ContentNodeRow.vue
@@ -39,6 +39,7 @@
     <td class="message">
       {{ message }}
     </td>
+    <ChannelUpdateAnnotations v-if="false" />
   </tr>
 
 </template>
@@ -49,12 +50,14 @@
   import ContentIcon from 'kolibri.coreVue.components.ContentIcon';
   import CoachContentLabel from 'kolibri.coreVue.components.CoachContentLabel';
   import { ContentNodeKinds } from 'kolibri.coreVue.vuex.constants';
+  import ChannelUpdateAnnotations from './ChannelUpdateAnnotations';
 
   export default {
     name: 'ContentNodeRow',
     components: {
       CoachContentLabel,
       ContentIcon,
+      ChannelUpdateAnnotations,
     },
     props: {
       node: {
diff --git a/kolibri/plugins/facility/assets/src/modules/manageCSV/actions.js b/kolibri/plugins/facility/assets/src/modules/manageCSV/actions.js
index 215df14f64b..7a3bca76b75 100644
--- a/kolibri/plugins/facility/assets/src/modules/manageCSV/actions.js
+++ b/kolibri/plugins/facility/assets/src/modules/manageCSV/actions.js
@@ -1,5 +1,5 @@
 import logger from 'kolibri.lib.logging';
-import { TaskResource } from 'kolibri.resources';
+import { TaskResource, FacilityTaskResource } from 'kolibri.resources';
 import client from 'kolibri.client';
 import urls from 'kolibri.urls';
 import { TaskStatuses, TaskTypes } from '../../constants';
@@ -95,10 +95,16 @@ function startExportUsers(store) {
 }
 
 function refreshTaskList(store) {
-  return TaskResource.fetchCollection({
-    force: true,
-  })
-    .then(newTasks => {
+  return Promise.all([
+    TaskResource.fetchCollection({
+      force: true,
+    }),
+    FacilityTaskResource.fetchCollection({
+      force: true,
+    }),
+  ])
+    .then(([newTasks, newFacilityTasks]) => {
+      console.log(newTasks);
       checkTaskStatus(
         store,
         newTasks,
@@ -117,7 +123,7 @@ function refreshTaskList(store) {
       );
       checkTaskStatus(
         store,
-        newTasks,
+        newFacilityTasks,
         TaskTypes.SYNCDATAPORTAL,
         store.state.facilityTaskId,
         'START_FACILITY_SYNC',
diff --git a/kolibri/plugins/facility/assets/src/modules/manageSync/index.js b/kolibri/plugins/facility/assets/src/modules/manageSync/index.js
deleted file mode 100644
index 69904c8d997..00000000000
--- a/kolibri/plugins/facility/assets/src/modules/manageSync/index.js
+++ /dev/null
@@ -1,38 +0,0 @@
-import { displayModal, SET_BUSY, SET_ERROR, SET_MODAL } from '../shared';
-
-function defaultState() {
-  return {
-    modalShown: false,
-    projectName: '',
-    targetFacility: null,
-    token: '',
-  };
-}
-
-export default {
-  namespaced: true,
-  state: defaultState(),
-  mutations: {
-    SET_STATE(state, payload) {
-      Object.assign(state, payload);
-    },
-    RESET_STATE(state) {
-      Object.assign(state, defaultState());
-    },
-    SET_PROJECT_NAME(state, name) {
-      state.projectName = name;
-    },
-    SET_TOKEN(state, token) {
-      state.token = token;
-    },
-    SET_TARGET_FACILITY(state, facility) {
-      state.targetFacility = facility;
-    },
-    SET_BUSY,
-    SET_ERROR,
-    SET_MODAL,
-  },
-  actions: {
-    displayModal,
-  },
-};
diff --git a/kolibri/plugins/facility/assets/src/modules/pluginModule.js b/kolibri/plugins/facility/assets/src/modules/pluginModule.js
index 5b45588f8f6..1c43895793f 100644
--- a/kolibri/plugins/facility/assets/src/modules/pluginModule.js
+++ b/kolibri/plugins/facility/assets/src/modules/pluginModule.js
@@ -6,7 +6,6 @@ import classManagement from './classManagement';
 import facilityConfig from './facilityConfig';
 import userManagement from './userManagement';
 import manageCSV from './manageCSV';
-import manageSync from './manageSync';
 import importCSV from './importCSV';
 
 export default {
@@ -53,7 +52,6 @@ export default {
     userManagement,
     facilityConfig,
     manageCSV,
-    manageSync,
     importCSV,
   },
 };
diff --git a/kolibri/plugins/facility/assets/src/routes.js b/kolibri/plugins/facility/assets/src/routes.js
index 1711437c68a..fd22f508915 100644
--- a/kolibri/plugins/facility/assets/src/routes.js
+++ b/kolibri/plugins/facility/assets/src/routes.js
@@ -95,7 +95,6 @@ export default [
     path: '/:facility_id?/data',
     handler: () => {
       store.dispatch('preparePage', { isAsync: false });
-      store.commit('manageSync/RESET_STATE');
     },
   },
   {
diff --git a/kolibri/plugins/facility/assets/src/views/DataPage/SyncInterface/index.vue b/kolibri/plugins/facility/assets/src/views/DataPage/SyncInterface/index.vue
index 4163e7716d1..5ad99eb2abd 100644
--- a/kolibri/plugins/facility/assets/src/views/DataPage/SyncInterface/index.vue
+++ b/kolibri/plugins/facility/assets/src/views/DataPage/SyncInterface/index.vue
@@ -18,48 +18,48 @@
           <th>{{ $tr('facility') }}</th>
         </tr>
       </thead>
-      <transition-group slot="tbody" tag="tbody" name="list">
-        <tr v-for="facility in facilities" :key="facility.id">
+      <tbody slot="tbody">
+        <tr>
           <td>
-            <FacilityNameAndSyncStatus :facility="facility" />
+            <FacilityNameAndSyncStatus :facility="theFacility" />
           </td>
           <td class="button-col">
-            <KButtonGroup style="margin-top: 8px;">
+            <KButtonGroup style="margin-top: 8px; overflow: visible">
               <KButton
                 appearance="raised-button"
                 :text="$tr('register')"
                 :disabled="facilityTaskId !== ''"
-
-                @click="register(facility)"
+                @click="register()"
               />
               <KButton
                 appearance="raised-button"
                 :text="$tr('sync')"
-
-                :disabled="facilityTaskId !== '' || !facility.dataset.registered"
-                @click="sync(facility)"
+                :disabled="facilityTaskId !== '' || !theFacility.dataset.registered"
+                @click="sync()"
               />
             </KButtonGroup>
           </td>
         </tr>
-      </transition-group>
+      </tbody>
     </CoreTable>
 
     <PrivacyModal
       v-if="modalShown === Modals.PRIVACY"
-      @cancel="displayModal(false)"
+      @cancel="displayModal(null)"
     />
 
     <RegisterFacilityModal
       v-if="modalShown === Modals.REGISTER_FACILITY"
-      @cancel="displayModal(false)"
       @success="handleValidateSuccess"
+      @cancel="displayModal(null)"
     />
     <ConfirmationRegisterModal
       v-if="modalShown === Modals.CONFIRMATION_REGISTER"
-      v-bind="{ projectName, targetFacility, token }"
-      @cancel="displayModal(false)"
+      :targetFacility="theFacility"
+      :projectName="projectName"
+      :token="token"
       @success="handleConfirmationSuccess"
+      @cancel="displayModal(null)"
     />
 
   </KPageContainer>
@@ -69,14 +69,15 @@
 
 <script>
 
-  import { mapState, mapActions } from 'vuex';
+  import find from 'lodash/find';
+  import { mapState } from 'vuex';
   import CoreTable from 'kolibri.coreVue.components.CoreTable';
   import {
     FacilityNameAndSyncStatus,
     ConfirmationRegisterModal,
     RegisterFacilityModal,
   } from 'kolibri.coreVue.componentSets.sync';
-  import { FacilityTaskResource } from 'kolibri.resources';
+  import commonSyncElements from 'kolibri.coreVue.mixins.commonSyncElements';
   import { Modals } from '../../../constants';
   import PrivacyModal from './PrivacyModal';
 
@@ -89,37 +90,43 @@
       RegisterFacilityModal,
       ConfirmationRegisterModal,
     },
+    mixins: [commonSyncElements],
+    data() {
+      return {
+        projectName: '',
+        token: '',
+        modalShown: null,
+      };
+    },
     computed: {
-      ...mapState('manageSync', ['modalShown', 'projectName', 'targetFacility', 'token']),
       ...mapState('manageCSV', ['facilityTaskId']),
       Modals: () => Modals,
-      facilities() {
-        return this.$store.state.manageCSV.facilities.filter(
-          ({ id }) => id === this.$store.getters.activeFacilityId
-        );
+      theFacility() {
+        return find(this.$store.state.manageCSV.facilities, {
+          id: this.$store.getters.activeFacilityId,
+        });
       },
     },
     methods: {
-      ...mapActions('manageSync', ['displayModal']),
-      register(facility) {
-        this.$store.commit('manageSync/SET_TARGET_FACILITY', facility);
-        this.displayModal(Modals.REGISTER_FACILITY);
+      displayModal(modal) {
+        this.modalShown = modal;
+      },
+      register() {
+        this.modalShown = Modals.REGISTER_FACILITY;
       },
-      sync(facility) {
-        FacilityTaskResource.dataportalsync(facility.id).then(response => {
-          this.$store.commit('manageCSV/START_FACILITY_SYNC', response.data);
+      sync() {
+        this.startKdpSyncTask(this.theFacility.id).then(task => {
+          this.$store.commit('manageCSV/START_FACILITY_SYNC', task);
         });
       },
-      handleValidateSuccess(payload) {
-        const { projectName, token } = payload;
-        this.$store.commit('manageSync/SET_PROJECT_NAME', projectName);
-        this.$store.commit('manageSync/SET_TOKEN', token);
-        this.displayModal(Modals.CONFIRMATION_REGISTER);
+      handleValidateSuccess({ name, token }) {
+        this.projectName = name;
+        this.token = token;
+        this.modalShown = Modals.CONFIRMATION_REGISTER;
       },
       handleConfirmationSuccess(payload) {
-        const { targetFacility } = payload;
-        this.$store.commit('manageCSV/SET_REGISTERED', targetFacility);
-        this.displayModal(false);
+        this.$store.commit('manageCSV/SET_REGISTERED', payload);
+        this.modalShown = null;
       },
     },
     $trs: {
diff --git a/kolibri/plugins/setup_wizard/api.py b/kolibri/plugins/setup_wizard/api.py
new file mode 100644
index 00000000000..31d9961d97f
--- /dev/null
+++ b/kolibri/plugins/setup_wizard/api.py
@@ -0,0 +1,87 @@
+from rest_framework.exceptions import NotFound
+from rest_framework.exceptions import PermissionDenied
+from rest_framework.permissions import BasePermission
+from rest_framework.response import Response
+from rest_framework.viewsets import GenericViewSet
+
+from kolibri.core.auth.constants import user_kinds
+from kolibri.core.auth.models import FacilityUser
+from kolibri.core.device.models import DevicePermissions
+
+
+# Basic class that makes these endpoints unusable if device is provisioned
+class HasPermissionDuringSetup(BasePermission):
+    def has_permission(self, request, view):
+        from kolibri.core.device.utils import device_provisioned
+
+        return not device_provisioned()
+
+
+class FacilityAdminView(GenericViewSet):
+    """
+    Returns basic data about admins from the just-imported Facility
+    """
+
+    permission_classes = (HasPermissionDuringSetup,)
+
+    def list(self, request):
+        # The filter is very loose, since we are assuming that the only
+        # users are from the new facility
+        queryset = FacilityUser.objects.filter(roles__kind__contains="admin")
+        response_data = [
+            {"username": user.username, "id": user.id} for user in queryset
+        ]
+        return Response(response_data)
+
+
+class GrantSuperuserPermissionsView(GenericViewSet):
+    """
+    Given a FacilityUser and their credentials, creates a DevicePermissions
+    record with is_superuser = True
+    """
+
+    permission_classes = (HasPermissionDuringSetup,)
+
+    def create(self, request):
+        user_id = request.data.get("user_id", "")
+        password = request.data.get("password", "")
+
+        # Step 1: Get the Facility User object
+        try:
+            facilityuser = FacilityUser.objects.get(id=user_id)
+        except (Exception, FacilityUser.DoesNotExist):
+            raise NotFound()
+
+        # Step 2: Test for password and admin role
+        if (
+            not facilityuser.check_password(password)
+            or user_kinds.ADMIN not in facilityuser.session_data["kind"]
+        ):
+            raise PermissionDenied()
+
+        # Step 3: If it succeeds, create a DevicePermissions model for
+        # the user
+        DevicePermissions.objects.update_or_create(
+            user=facilityuser,
+            defaults={"is_superuser": True, "can_manage_content": True},
+        )
+
+        # Finally: return a simple 200 so UI can continue on
+        return Response({"user_id": user_id})
+
+
+class StartFacilityImportTaskView(GenericViewSet):
+    """
+    Given a Device ID, Facility ID, and admin credentials, start
+    a Facility Import task
+    """
+
+    permission_classes = (HasPermissionDuringSetup,)
+
+    def create(self, request):
+        # Step 1: Send all of the info over to the facility-import endpoint
+
+        # If it fails, returns a 400
+
+        # Step 2: If it succeeds, return 200. UI will continue to the progress page
+        return Response(request.data)
diff --git a/kolibri/plugins/setup_wizard/api_urls.py b/kolibri/plugins/setup_wizard/api_urls.py
new file mode 100644
index 00000000000..796c7cd1477
--- /dev/null
+++ b/kolibri/plugins/setup_wizard/api_urls.py
@@ -0,0 +1,23 @@
+from django.conf.urls import include
+from django.conf.urls import url
+from rest_framework import routers
+
+from .api import FacilityAdminView
+from .api import GrantSuperuserPermissionsView
+from .api import StartFacilityImportTaskView
+
+router = routers.DefaultRouter()
+
+router.register(r"facilityadmins", FacilityAdminView, base_name="facilityadmins")
+router.register(
+    r"grantsuperuserpermissions",
+    GrantSuperuserPermissionsView,
+    base_name="grantsuperuserpermissions",
+)
+router.register(
+    r"startfacilityimporttask",
+    StartFacilityImportTaskView,
+    base_name="startfacilityimporttask",
+)
+
+urlpatterns = [url(r"^", include(router.urls))]
diff --git a/kolibri/plugins/setup_wizard/assets/src/modules/pluginModule.js b/kolibri/plugins/setup_wizard/assets/src/modules/pluginModule.js
index 354da6130fb..d5870d198ae 100644
--- a/kolibri/plugins/setup_wizard/assets/src/modules/pluginModule.js
+++ b/kolibri/plugins/setup_wizard/assets/src/modules/pluginModule.js
@@ -51,6 +51,22 @@ export default {
     error: false,
   },
   actions: {
+    getFacilityAdmins() {
+      return client({
+        url: urls['kolibri:kolibri.plugins.setupWizard:facilityadminsList'](),
+      }).then(response => {
+        return response.data;
+      });
+    },
+    grantSuperuserPermisions(store, data) {
+      return client({
+        url: urls['kolibri:kolibri.plugins.setupWizard:grantsuperuserpermissionsList'](),
+        data: {
+          user_id: data.user_id,
+          password: data.password,
+        },
+      });
+    },
     provisionDevice(store) {
       const onboardingData = store.state.onboardingData;
 
diff --git a/kolibri/plugins/setup_wizard/assets/src/views/importFacility/LoadingTaskPage.vue b/kolibri/plugins/setup_wizard/assets/src/views/importFacility/LoadingTaskPage.vue
index 6b1806dbed6..2e53726c0fa 100644
--- a/kolibri/plugins/setup_wizard/assets/src/views/importFacility/LoadingTaskPage.vue
+++ b/kolibri/plugins/setup_wizard/assets/src/views/importFacility/LoadingTaskPage.vue
@@ -20,7 +20,7 @@
           @click="retryImport"
         />
         <KButton
-          text="Start over"
+          :text="coreString('starOverAction')"
           appearance="flat-button"
           @click="startOver"
         />
diff --git a/kolibri/plugins/setup_wizard/assets/src/views/importFacility/SelectSuperAdminAccountForm.vue b/kolibri/plugins/setup_wizard/assets/src/views/importFacility/SelectSuperAdminAccountForm.vue
index f9314219c1c..9207266e1dc 100644
--- a/kolibri/plugins/setup_wizard/assets/src/views/importFacility/SelectSuperAdminAccountForm.vue
+++ b/kolibri/plugins/setup_wizard/assets/src/views/importFacility/SelectSuperAdminAccountForm.vue
@@ -1,11 +1,15 @@
 <template>
 
   <SuperuserCredentialsForm
+    v-if="!loading"
     :header="$tr('header')"
     :description="$tr('description')"
     @click_next="handleClickNext"
   >
     <template v-slot:aboveform>
+      <p v-if="error" class="error">
+        {{ coreString('invalidCredentialsError') }}
+      </p>
       <p>
         {{ $tr('chooseAdminPrompt', {
           facility: facility.name
@@ -63,23 +67,6 @@
 
   const CREATE_NEW_SUPER_ADMIN = 'CREATE_NEW_SUPER_ADMIN';
 
-  const fakeAdmins = [
-    {
-      id: '1234',
-      username: 'superadmin',
-    },
-    {
-      id: '2345',
-      username: 'otheradmin1',
-    },
-    {
-      id: '3456',
-      username: 'otheradmin2',
-    },
-  ];
-
-  // TODO
-  // - Required field validation for simple password
   export default {
     name: 'SelectSuperAdminAccountForm',
     components: {
@@ -99,6 +86,8 @@
         password: '',
         passwordValid: false,
         shouldValidate: false,
+        loading: true,
+        error: false,
         facilityAdmins: [],
       };
     },
@@ -130,11 +119,16 @@
     },
     methods: {
       fetchFacilityAdmins() {
-        return Promise.resolve(fakeAdmins).then(() => {
-          this.facilityAdmins = [...fakeAdmins];
-          this.selected = { ...this.dropdownOptions[0] };
-          this.loading = false;
-        });
+        this.$store
+          .dispatch('getFacilityAdmins')
+          .then(admins => {
+            this.facilityAdmins = [...admins];
+            this.selected = { ...this.dropdownOptions[0] };
+            this.loading = false;
+          })
+          .catch(error => {
+            this.$store.dispatch('handleApiError', error);
+          });
       },
       resetFormAndRefocus() {
         this.shouldValidate = false;
@@ -142,10 +136,27 @@
           this.$refs.password.resetAndFocus();
         }
       },
+      grantPermissions(data) {
+        this.error = false;
+        return this.$store.dispatch('grantSuperuserPermisions', data);
+      },
       handleClickNext() {
         this.shouldValidate = true;
-        if (this.existingUser && !this.passwordValid) {
-          this.$refs.password.focus();
+        if (this.existingUser) {
+          if (this.passwordValid) {
+            this.grantPermissions({
+              user_id: this.selected.value,
+              password: this.password,
+            })
+              .then(() => {
+                this.$emit('click_next');
+              })
+              .catch(() => {
+                this.error = true;
+              });
+          } else {
+            this.$refs.password.focus();
+          }
         } else {
           this.$emit('click_next');
         }
@@ -190,4 +201,8 @@
     margin: 24px 0;
   }
 
+  .error {
+    color: red;
+  }
+
 </style>
diff --git a/kolibri/plugins/setup_wizard/kolibri_plugin.py b/kolibri/plugins/setup_wizard/kolibri_plugin.py
index 3c5a3ca9699..49c1dffafc6 100644
--- a/kolibri/plugins/setup_wizard/kolibri_plugin.py
+++ b/kolibri/plugins/setup_wizard/kolibri_plugin.py
@@ -9,6 +9,7 @@
 
 
 class SetupWizardPlugin(KolibriPluginBase):
+    untranslated_view_urls = "api_urls"
     translated_view_urls = "urls"
 
 
diff --git a/kolibri/plugins/setup_wizard/test/__init__.py b/kolibri/plugins/setup_wizard/test/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/kolibri/plugins/setup_wizard/test/test_api.py b/kolibri/plugins/setup_wizard/test/test_api.py
new file mode 100644
index 00000000000..63c8be84de1
--- /dev/null
+++ b/kolibri/plugins/setup_wizard/test/test_api.py
@@ -0,0 +1,82 @@
+from __future__ import absolute_import
+from __future__ import print_function
+from __future__ import unicode_literals
+
+from django.core.urlresolvers import reverse
+from rest_framework.test import APITestCase
+
+from kolibri.core.auth.test.helpers import create_dummy_facility_data
+from kolibri.core.auth.test.helpers import provision_device
+
+
+class FacilityAdminViewTest(APITestCase):
+    def setUp(self):
+        create_dummy_facility_data(classroom_count=1)
+
+    def _make_request(self):
+        return self.client.get(
+            reverse("kolibri:kolibri.plugins.setup_wizard:facilityadmins-list"),
+            format="json",
+        )
+
+    def test_fails_if_device_provisioned(self):
+        provision_device()
+        response = self._make_request()
+        self.assertEqual(response.status_code, 403)
+
+    def test_only_returns_admins(self):
+        response = self._make_request()
+        sorted_admins = sorted(response.data, key=lambda x: x["username"])
+        self.assertEqual(sorted_admins[0]["username"], "classadmin0")
+        self.assertEqual(sorted_admins[1]["username"], "facadmin")
+
+
+class GrantSuperuserPermissionsViewTest(APITestCase):
+    def setUp(self):
+        facility_data = create_dummy_facility_data(classroom_count=1)
+        self.admin = facility_data["facility_admin"]
+        self.admin.set_password("password")
+        self.admin.save()
+        self.coach = facility_data["classroom_coaches"][0]
+        self.coach.set_password("password")
+        self.coach.save()
+
+    def _make_request(self, data):
+        return self.client.post(
+            reverse(
+                "kolibri:kolibri.plugins.setup_wizard:grantsuperuserpermissions-list"
+            ),
+            data,
+            format="json",
+        )
+
+    def test_fails_if_device_provisioned(self):
+        provision_device()
+        response = self._make_request(
+            {"user_id": self.admin.id, "password": "password"}
+        )
+        self.assertEqual(response.status_code, 403)
+
+    def test_fails_if_user_not_found(self):
+        id_copy = self.admin.id
+        self.admin.delete()
+        response = self._make_request({"user_id": id_copy, "password": "password"})
+        self.assertEqual(response.status_code, 404)
+
+    def test_fails_if_password_invalid(self):
+        response = self._make_request(
+            {"user_id": self.admin.id, "password": "passward"}
+        )
+        self.assertEqual(response.status_code, 403)
+
+    def test_fails_if_user_not_admin(self):
+        response = self._make_request(
+            {"user_id": self.coach.id, "password": "password"}
+        )
+        self.assertEqual(response.status_code, 403)
+
+    def test_successfully_adds_device_permissions(self):
+        response = self._make_request(
+            {"user_id": self.admin.id, "password": "password"}
+        )
+        self.assertEqual(response.status_code, 200)
diff --git a/requirements/dev.txt b/requirements/dev.txt
index 8dfc877b0e7..c68c76cd7d4 100644
--- a/requirements/dev.txt
+++ b/requirements/dev.txt
@@ -1,5 +1,6 @@
 -r base.txt
-flake8==3.8.0
+ipdb==0.13.2
+flake8==3.8.3
 pre-commit==1.15.1
 tox==3.1.3
 django-debug-panel==0.8.3