diff --git a/js/components/atlas.cohort-editor.html b/js/components/atlas.cohort-editor.html
index 8134278db..dc3f2bc90 100644
--- a/js/components/atlas.cohort-editor.html
+++ b/js/components/atlas.cohort-editor.html
@@ -12,6 +12,7 @@
 		<cohort-expression-viewer params="expression: $component.currentCohortDefinition().expression"></cohort-expression-viewer>
 		<!-- /ko -->
 		<div class="modal fade" data-bind="modal: showModal" tabindex="-1" role="dialog">
+			<!-- ko if:showModal-->
 			<div class="modal-dialog modal-lg">
 				<div class="modal-content">
 					<div class="modal-header" data-bind="text: ko.i18n('components.atlasCohortEditor.importConceptSet', 'Import Concept Set From Repository...')"></div>
@@ -27,6 +28,7 @@
 					</div>
 				</div>
 			</div>
+			<!-- /ko -->
 		</div>
 	</div>
 </div>
diff --git a/js/components/circe/components/ConceptSetBrowser.js b/js/components/circe/components/ConceptSetBrowser.js
index db9df0830..6ac03a981 100644
--- a/js/components/circe/components/ConceptSetBrowser.js
+++ b/js/components/circe/components/ConceptSetBrowser.js
@@ -126,8 +126,7 @@ define([
 		// dispose subscriptions
 
 		// startup actions
-		self.loadConceptSetsFromRepository(self.selectedSource()
-			.url);
+		self.loadConceptSetsFromRepository(self.selectedSource().url);
 
 		this.options = {
 			Facets: [
@@ -175,7 +174,7 @@ define([
 				render: datatableUtils.getCreatedByFormatter(),
 			}
 		]);
-
+		
 		const { pageLength, lengthMenu } = commonUtils.getTableOptions('M');
 		this.pageLength = params.pageLength || pageLength;
 		this.lengthMenu = params.lengthMenu || lengthMenu;
diff --git a/js/components/from-reusables-modal/from-reusables-modal.html b/js/components/from-reusables-modal/from-reusables-modal.html
index e6cf8ca62..2fac4e837 100644
--- a/js/components/from-reusables-modal/from-reusables-modal.html
+++ b/js/components/from-reusables-modal/from-reusables-modal.html
@@ -50,6 +50,7 @@ <h2 class="selected-reusable-name" data-bind="text: selectedReusable().name"></h
 </atlas-modal>
 
 <div data-bind="modal: showCsBrowser" class="modal fade cs-modal" tabindex="-1" role="dialog">
+    <!-- ko if:showCsBrowser-->
     <div class="modal-dialog modal-lg">
         <div class="modal-content">
             <div class="modal-header" data-bind="text: ko.i18n('components.conceptSetBuilder.selectConceptSet', 'Select Concept Set...')"></div>
@@ -62,4 +63,5 @@ <h2 class="selected-reusable-name" data-bind="text: selectedReusable().name"></h
             </div>
         </div>
     </div>
+    <!-- /ko -->
 </div>
diff --git a/js/extensions/bindings/datatableBinding.js b/js/extensions/bindings/datatableBinding.js
index 24b6a5d47..bea69e501 100644
--- a/js/extensions/bindings/datatableBinding.js
+++ b/js/extensions/bindings/datatableBinding.js
@@ -298,7 +298,7 @@ define([
 			table.clear();
 
 			// Rebuild table from data source specified in binding
-			if (data.length > 0)
+			if (data && data.length > 0)
 				table.rows.add(data);
 
 			// drawing may access observables, which updating we do not want to trigger a redraw to the table
diff --git a/js/services/AuthAPI.js b/js/services/AuthAPI.js
index b81a7c448..6c5a8a891 100644
--- a/js/services/AuthAPI.js
+++ b/js/services/AuthAPI.js
@@ -517,7 +517,9 @@ define(function(require, exports) {
 
     const executeWithRefresh = async function(httpPromise) {
         const result = await httpPromise;
-        await refreshToken();
+        if (config.userAuthenticationEnabled) {
+            await refreshToken();
+        }
         return result;
     }