diff --git a/src/app/components/connect-addon-modal/connect-addon-modal.coffee b/src/app/components/connect-addon-modal/connect-addon-modal.coffee
index f7c9c045..967a512f 100644
--- a/src/app/components/connect-addon-modal/connect-addon-modal.coffee
+++ b/src/app/components/connect-addon-modal/connect-addon-modal.coffee
@@ -54,6 +54,27 @@ angular.module('mnoEnterpriseAngular').component('connectAddonModal', {
         ctrl.isUpdating = false
       )
 
+    ctrl.backClick = ->
+      switch ctrl.currentStep
+        when 1 then ctrl.disconnect()
+        when 2 then ctrl.unselectEntities()
+
+    ctrl.nextClick = ->
+      switch ctrl.currentStep
+        when 0 then ctrl.submitForm()
+        when 1 then ctrl.updateEntities()
+        when 2 then ctrl.synchronize(ctrl.historicalData)
+
+    ctrl.disconnect = ->
+      ctrl.isDisconnecting = true
+      MnoeAppInstances.disconnect(ctrl.app)
+        .then((response) ->
+          ctrl.app.addon_organization.has_account_linked = false
+          ctrl.app.addon_organization.sync_enabled = false
+          ctrl.currentStep = 0
+          ctrl.isDisconnecting = false
+        )
+
     ctrl.synchronize = (historicalData) ->
       MnoeAppInstances.sync(ctrl.app, historicalData)
       ctrl.app.addon_organization.sync_enabled = true
diff --git a/src/app/components/connect-addon-modal/connect-addon-modal.html b/src/app/components/connect-addon-modal/connect-addon-modal.html
index a444da85..969ceac5 100644
--- a/src/app/components/connect-addon-modal/connect-addon-modal.html
+++ b/src/app/components/connect-addon-modal/connect-addon-modal.html
@@ -63,17 +63,19 @@ <h4 class="text-center">{{"mno_enterprise.templates.components.addon_connect.syn
   </div>
 
   <div class="modal-footer">
-    <button class="btn btn-default" ng-click="$ctrl.close()">{{"mno_enterprise.webhook.o_auth.providers.cancel" | translate}}</button>
-    <button class="btn btn-success" ng-show="$ctrl.currentStep == 0" ng-disabled="$ctrl.isSubmitting" ng-click="$ctrl.submitForm()">
-      {{'mno_enterprise.templates.components.addon_connect.link_account.submit_form' | translate}}
-      <i class="fa fa-refresh fa-spin" ng-if="$ctrl.isSubmitting"></i>
-    </button>
-    <button class="btn btn-success" ng-show="$ctrl.currentStep == 1" ng-disabled="$ctrl.isUpdating" ng-click="$ctrl.updateEntities()">
-      {{'mno_enterprise.templates.components.addon_connect.entities.update_entities' | translate}}
-      <i class="fa fa-refresh fa-spin" ng-if="$ctrl.isUpdating"></i>
-    </button>
-    <button class="btn btn-success" ng-show="$ctrl.currentStep == 2" ng-click="$ctrl.synchronize(ctrl.historicalData)">
-      {{'mno_enterprise.templates.components.addon_connect.sync.start_sync' | translate}}
-    </button>
+    <div class="btn-toolbar">
+      <button class="btn btn-default" ng-click="$ctrl.close()">{{"mno_enterprise.webhook.o_auth.providers.cancel" | translate}}</button>
+      <div class="pull-right">
+        <button class="btn btn-warning" ng-if="$ctrl.currentStep != 0" ng-click="$ctrl.backClick()" ng-disabled="$ctrl.isDisconnecting">
+          <i class="fa fa-arrow-left"></i>
+          {{"mno_enterprise.templates.components.addon_connect.back" | translate"}}
+        </button>
+        <button class="btn btn-success" ng-click="$ctrl.nextClick()" ng-disabled="$ctrl.isSubmitting || $ctrl.isUpdating">
+          {{"mno_enterprise.templates.components.addon_connect.next" | translate"}}
+          <i class="fa fa-arrow-right"></i>
+          <i class="fa fa-refresh fa-spin" ng-if="$ctrl.isSubmitting || $ctrl.isUpdating"></i>
+        </button>
+      </div>
+    </div>
   </div>
 </div>
diff --git a/src/app/views/apps/modals/app-settings-modal.coffee b/src/app/views/apps/modals/app-settings-modal.coffee
index ba3116c5..83abd4bd 100755
--- a/src/app/views/apps/modals/app-settings-modal.coffee
+++ b/src/app/views/apps/modals/app-settings-modal.coffee
@@ -162,7 +162,7 @@ angular.module 'mnoEnterpriseAngular'
         template: htmlTemplate
       }
 
-    $scope.loadIdMaps = (externalName, input = null) ->
+    $scope.loadIdMaps = (externalName = 'All', input = null) ->
       $scope.idMaps.loading = true
       $scope.idMaps.entityName = externalName
       params = {
diff --git a/src/app/views/apps/modals/app-settings-modal.html b/src/app/views/apps/modals/app-settings-modal.html
index ef3c47f1..51245654 100755
--- a/src/app/views/apps/modals/app-settings-modal.html
+++ b/src/app/views/apps/modals/app-settings-modal.html
@@ -32,7 +32,7 @@ <h4 class="text-center" style="margin-bottom: 20px; margin-top: 20px">{{ 'mno_en
             </div>
           </uib-tab>
 
-          <uib-tab index="1" heading="{{'mno_enterprise.templates.impac.dock.settings.id_maps.title' | translate}}" select="selectData()">
+          <uib-tab index="1" heading="{{'mno_enterprise.templates.impac.dock.settings.id_maps.title' | translate}}" select="selectData()" ng-click="loadIdMaps()">
             <div>
               <mno-sortable-table row-collection="idMaps.list" fields="mnoIdMapsTableFields" sub-headers="mnoIdMapsSubHeaders" is-loading="idMaps.loading" pipe="sortableIdMapsServerPipe"></mno-sortable-table>
               <div class="pagination">
diff --git a/src/locales/en.json b/src/locales/en.json
index 1515ec27..c053c7e7 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -943,6 +943,8 @@
   "mno_enterprise.templates.components.without_organisation.button": "Create an organisation",
   "mno_enterprise.templates.components.without_organisation.logout": "Logout",
   "mno_enterprise.templates.components.addon_connect.title": "Connect to {appname}",
+  "mno_enterprise.templates.components.addon_connect.back": "Back",
+  "mno_enterprise.templates.components.addon_connect.next": "Next",
   "mno_enterprise.templates.components.addon_connect.link_account.title": "Link your account",
   "mno_enterprise.templates.components.addon_connect.link_account.link": "Link your {appname} account to Maestrano to get your business in sync.",
   "mno_enterprise.templates.components.addon_connect.link_account.submit_form": "Submit",