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 0bfca430..1561af65 100644
--- a/src/app/components/connect-addon-modal/connect-addon-modal.coffee
+++ b/src/app/components/connect-addon-modal/connect-addon-modal.coffee
@@ -11,7 +11,6 @@ angular.module('mnoEnterpriseAngular').component('connectAddonModal', {
 
     ctrl.app = null
     ctrl.model = {}
-    ctrl.currentStep = 0
     ctrl.isFormLoading = true
     ctrl.isSubmitting = false
     ctrl.historicalData = false
@@ -19,7 +18,7 @@ angular.module('mnoEnterpriseAngular').component('connectAddonModal', {
 
     ctrl.$onInit = ->
       ctrl.app = ctrl.resolve.app
-      ctrl.currentStep = ctrl.app.addon_organization.has_account_linked ? 1 : 0
+      ctrl.currentStep = if ctrl.app.addon_organization.has_account_linked then 1 else 0
       MnoeAppInstances.getForm(ctrl.app).then((response) ->
         ctrl.schema = response.schema
         ctrl.form = [ "*" ]
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 861be16f..f3b32e60 100644
--- a/src/app/components/connect-addon-modal/connect-addon-modal.html
+++ b/src/app/components/connect-addon-modal/connect-addon-modal.html
@@ -6,16 +6,15 @@
         translate-values="{appname: $ctrl.app.name}"></h3>
   </div>
 
-
   <div>
     <ul class="breadcrumb" ng-switch on="$ctrl.currentStep">
-      <li ng-switch-when="false|0" ng-switch-when-separator="|">{{"mno_enterprise.templates.components.addon_connect.link_account.title" | translate}}</li>
-      <li ng-switch-when="false|0" ng-switch-when-separator="|"><a href="#" class="not-active">{{"mno_enterprise.templates.components.addon_connect.entities.select" | translate}}</a></li>
-      <li ng-switch-when="false|0" ng-switch-when-separator="|"><a href="#" class="not-active">{{"mno_enterprise.templates.components.addon_connect.sync.start_sync" | translate}}</a></li>
+      <li ng-switch-when="0">{{"mno_enterprise.templates.components.addon_connect.link_account.title" | translate}}</li>
+      <li ng-switch-when="0"><a href="#" class="not-active">{{"mno_enterprise.templates.components.addon_connect.entities.select" | translate}}</a></li>
+      <li ng-switch-when="0"><a href="#" class="not-active">{{"mno_enterprise.templates.components.addon_connect.sync.start_sync" | translate}}</a></li>
 
-      <li ng-switch-when="true|1|2" ng-switch-when-separator="|"><a href="#" class="not-active">{{"mno_enterprise.templates.components.addon_connect.link_account.title" | translate}}</a></li>
-      <li ng-switch-when="true|1" ng-switch-when-separator="|">{{"mno_enterprise.templates.components.addon_connect.entities.select" | translate}}</li>
-      <li ng-switch-when="true|1" ng-switch-when-separator="|"><a href="#" ng-click="$ctrl.forceSelectEntities()">{{"mno_enterprise.templates.components.addon_connect.sync.start_sync" | translate}}</a></li>
+      <li ng-switch-when="1|2" ng-switch-when-separator="|"><a href="#" class="not-active">{{"mno_enterprise.templates.components.addon_connect.link_account.title" | translate}}</a></li>
+      <li ng-switch-when="1">{{"mno_enterprise.templates.components.addon_connect.entities.select" | translate}}</li>
+      <li ng-switch-when="1"><a href="#" ng-click="$ctrl.forceSelectEntities()">{{"mno_enterprise.templates.components.addon_connect.sync.start_sync" | translate}}</a></li>
 
       <li ng-switch-when="2"><a href="#" ng-click="$ctrl.unselectEntities()">{{"mno_enterprise.templates.components.addon_connect.entities.select" | translate}}</a></li>
       <li ng-switch-when="2">{{"mno_enterprise.templates.components.addon_connect.sync.start_sync" | translate}}</li>
@@ -36,12 +35,12 @@ <h4 class="text-center">{{"mno_enterprise.templates.components.addon_connect.ent
 
       <table class="table-striped table-condensed" width="100%">
         <tr>
-          <th>{{"mno_enterprise.templates.components.addon_connect.entities.entity" | translate}}&nbsp</th>
-          <th>{{"mno_enterprise.templates.components.addon_connect.entities.to_app" | translate:{ appname: $ctrl.app.app_name} }}&nbsp</th>
-          <th>{{"mno_enterprise.templates.components.addon_connect.entities.to_connec" | translate:{ appname: $ctrl.app.app_name} }}&nbsp</th>
+          <th>{{"mno_enterprise.templates.components.addon_connect.entities.entity" | translate}}</th>
+          <th>{{"mno_enterprise.templates.components.addon_connect.entities.to_app" | translate:{ appname: $ctrl.app.app_name} }}</th>
+          <th>{{"mno_enterprise.templates.components.addon_connect.entities.to_connec" | translate:{ appname: $ctrl.app.app_name} }}</th>
         </tr>
         <tr ng-repeat="entity in $ctrl.app.addon_organization.displayable_synchronized_entities">
-          <td>{{entity.connec_name}}&nbsp</td>
+          <td>{{entity.connec_name}}</td>
           <td align="center"><input type="checkbox" ng-model="entity.can_push_to_external" checked="entity.can_push_to_external"/></td>
           <td align="center"><input type="checkbox" ng-model="entity.can_push_to_connec" checked="entity.can_push_to_connec"/></td>
         </tr>
@@ -63,7 +62,6 @@ <h4 class="text-center">{{"mno_enterprise.templates.components.addon_connect.syn
     </div>
   </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()">
diff --git a/src/app/views/apps/modals/app-settings-modal.coffee b/src/app/views/apps/modals/app-settings-modal.coffee
index 12343a94..ba3116c5 100755
--- a/src/app/views/apps/modals/app-settings-modal.coffee
+++ b/src/app/views/apps/modals/app-settings-modal.coffee
@@ -217,6 +217,9 @@ angular.module 'mnoEnterpriseAngular'
         sort = "-#{sort}" if sortState.reverse
       return sort
 
+    $scope.syncEnabled = ->
+      MnoeAppInstances.isAddOnWithOrg($scope.app) && $scope.app.addon_organization.sync_enabled
+
     $scope.selectHistory = ->
       $scope.selectedTab = 0
 
diff --git a/src/app/views/apps/modals/app-settings-modal.html b/src/app/views/apps/modals/app-settings-modal.html
index 91ee9deb..d0358538 100755
--- a/src/app/views/apps/modals/app-settings-modal.html
+++ b/src/app/views/apps/modals/app-settings-modal.html
@@ -105,7 +105,7 @@ <h4 class="text-center" style="margin-bottom: 20px; margin-top: 20px">{{"mno_ent
               </button>
               <button class="btn btn-danger" ng-hide="app.showDelete" ng-click="app.showDelete = !app.showDelete">{{ 'mno_enterprise.templates.impac.dock.settings.delete' | translate }}</button>
               <div class="pull-right">
-                <button class="btn btn-success" ng-if="selectedTab == 0" ng-click="syncApp()">{{"mno_enterprise.templates.impac.dock.settings.sync" | translate}}</button>
+                <button class="btn btn-success" ng-if="selectedTab == 0 && syncEnabled()" ng-click="syncApp()">{{"mno_enterprise.templates.impac.dock.settings.sync" | translate}}</button>
                 <button class="btn btn-success" ng-if="selectedTab == 2" ng-click="syncApp()">{{"mno_enterprise.templates.impac.dock.settings.entities.update" | translate}}</button>
               </div>
             </div>