diff --git a/index.html b/index.html
index ec01cbf..53b6f99 100644
--- a/index.html
+++ b/index.html
@@ -266,7 +266,7 @@
             bottom: 0;
             right: 0;
             transition: 0.3s opacity linear;
-            z-index: 10000;
+            z-index: 100;
             background-color: var(--background-dark);
             cursor: wait;
             display: flex;
diff --git a/src/App.vue b/src/App.vue
index 18c6b05..9110bc9 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -17,7 +17,7 @@
 <template>
 	<Map></Map>
 	<ChatBox v-if="chatBoxEnabled" v-show="chatBoxEnabled && chatVisible"></ChatBox>
-	<LoginModal v-if="loginEnabled"></LoginModal>
+	<LoginModal v-if="loginEnabled" :required="loginRequired"></LoginModal>
 	<Sidebar></Sidebar>
 	<notifications position="bottom center" :speed="250" :max="3" :ignoreDuplicates="true" classes="notification" />
 </template>
@@ -54,9 +54,11 @@ export default defineComponent({
 			currentServer = computed(() => store.state.currentServer),
 			configurationHash = computed(() => store.state.configurationHash),
 			chatBoxEnabled = computed(() => store.state.components.chatBox),
-			loginEnabled = computed(() => store.state.components.login),
 			chatVisible = computed(() => store.state.ui.visibleElements.has('chat')),
+
+			loginEnabled = computed(() => store.state.components.login),
 			loggedIn = computed(() => store.state.loggedIn),
+			loginRequired = ref(false),
 
 			loading = ref(false),
 			loadingAttempts = ref(0),
@@ -72,6 +74,8 @@ export default defineComponent({
 					await store.dispatch(ActionTypes.LOAD_CONFIGURATION, undefined);
 					await store.dispatch(ActionTypes.START_UPDATES, undefined);
 
+					loginRequired.value = false;
+
 					requestAnimationFrame(() => {
 						hideSplash();
 
@@ -89,7 +93,7 @@ export default defineComponent({
 
 					//Show login screen if required
 					if(e.message === 'login-required') {
-						hideSplash();
+						loginRequired.value = true;
 						store.commit(MutationTypes.SHOW_UI_MODAL, 'login');
 						notify('Login required');
 						return;
@@ -212,6 +216,7 @@ export default defineComponent({
 			chatBoxEnabled,
 			chatVisible,
 			loginEnabled,
+			loginRequired,
 		}
 	},
 });
diff --git a/src/components/Sidebar.vue b/src/components/Sidebar.vue
index 3e8240b..9c220d2 100644
--- a/src/components/Sidebar.vue
+++ b/src/components/Sidebar.vue
@@ -152,7 +152,7 @@ export default defineComponent({
 
 .sidebar {
 	position: fixed;
-	z-index: 120;
+	z-index: 110;
 	top: 0;
 	right: 0;
 	bottom: 0;
diff --git a/src/store/state.ts b/src/store/state.ts
index 8772324..dc3685a 100644
--- a/src/store/state.ts
+++ b/src/store/state.ts
@@ -45,6 +45,7 @@ export type State = {
 	components: LiveAtlasComponentConfig;
 
 	loggedIn: boolean;
+	loginRequired: boolean;
 
 	worlds: Map<string, LiveAtlasWorldDefinition>;
 	maps: Map<string, LiveAtlasMapDefinition>;
@@ -170,6 +171,7 @@ export const state: State = {
 	},
 
 	loggedIn: false,
+	loginRequired: false,
 
 	worlds: new Map(), //Defined (loaded) worlds with maps from configuration.json
 	maps: new Map(), //Defined maps from configuration.json