diff --git a/src/DeleteShopAccountSetting.vue b/src/DeleteShopAccountSetting.vue
index 6c1f1ebb8e3d764f3f45ba445c0c08bb51f165f1..da7a5a7e941b640b9ce14bb76be9155252924e34 100644
--- a/src/DeleteShopAccountSetting.vue
+++ b/src/DeleteShopAccountSetting.vue
@@ -1,63 +1,68 @@
 <template>
-	<SettingsSection v-if="shopUsers.length > 0" :name="t(appName, 'Options')">
-		<div>
-			<p>
-				{{
-					t(appName, 'We are going to proceed with your cloud account suppression.')
-				}}
-				<span v-if="!hasActiveSubscription">
+	<div>
+		<SettingsSection v-if="shopUsers.length > 0" :name="t(appName, 'Options')">
+			<div>
+				<p>
 					{{
-						t(appName, 'Check the box below if you also want to delete the associated shop account(s).')
+						t(appName, 'We are going to proceed with your cloud account suppression.')
 					}}
-				</span>
-			</p>
+					<span v-if="!hasActiveSubscription">
+						{{
+							t(appName, 'Check the box below if you also want to delete the associated shop account(s).')
+						}}
+					</span>
+				</p>
 
-			<p><span v-if="orderCount > 0" v-html="ordersDescription" /></p>
-			<p v-if="hasActiveSubscription">
-				<b>
-					{{
-						t(appName, 'A subscription is active in this account. Please cancel it or let it expire before deleting your account.')
-					}}
-				</b>
-			</p>
+				<p><span v-if="orderCount > 0" v-html="ordersDescription" /></p>
+				<p v-if="hasActiveSubscription">
+					<b>
+						{{
+							t(appName, 'A subscription is active in this account. Please cancel it or let it expire before deleting your account.')
+						}}
+					</b>
+				</p>
 
-			<form @submit.prevent>
-				<div v-if="!onlyUser && !onlyAdmin" id="delete-shop-account-settings">
-					<div class="delete-shop-input">
-						<CheckboxRadioSwitch id="shop-accounts_confirm"
-							:checked.sync="deleteShopAccount"
-							:disabled="hasActiveSubscription || !allowDelete"
-							@update:checked="updateDeleteShopPreference">
-							{{
-								t(
-									appName,
-									"I also want to delete my shop account"
-								)
-							}}
-						</CheckboxRadioSwitch>
+				<form @submit.prevent>
+					<div v-if="!onlyUser && !onlyAdmin" id="delete-shop-account-settings">
+						<div class="delete-shop-input">
+							<CheckboxRadioSwitch id="shop-accounts_confirm"
+								:checked.sync="deleteShopAccount"
+								:disabled="hasActiveSubscription || !allowDelete"
+								@update:checked="updateDeleteShopPreference">
+								{{
+									t(
+										appName,
+										"I also want to delete my shop account"
+									)
+								}}
+							</CheckboxRadioSwitch>
+						</div>
+						<div v-if="!deleteShopAccount" class="delete-shop-input">
+							<label for="shop-alternate-email">
+								{{
+									t(
+										appName,
+										"If you want to keep your shop account please validate or modify the email address below. This email address will become your new login to the shop."
+									)
+								}}
+							</label>
+							<input id="shop-alternate-email"
+								v-model="shopEmailPostDelete"
+								type="email"
+								name="shop-alternate-email"
+								:placeholder="t(appName, 'Email Address')"
+								class="form-control"
+								:disabled="hasActiveSubscription || !allowDelete"
+								@blur="updateEmailPostDelete($event)">
+						</div>
 					</div>
-					<div v-if="!deleteShopAccount" class="delete-shop-input">
-						<label for="shop-alternate-email">
-							{{
-								t(
-									appName,
-									"If you want to keep your shop account please validate or modify the email address below. This email address will become your new login to the shop."
-								)
-							}}
-						</label>
-						<input id="shop-alternate-email"
-							v-model="shopEmailPostDelete"
-							type="email"
-							name="shop-alternate-email"
-							:placeholder="t(appName, 'Email Address')"
-							class="form-control"
-							:disabled="hasActiveSubscription || !allowDelete"
-							@blur="updateEmailPostDelete($event)">
-					</div>
-				</div>
-			</form>
+				</form>
+			</div>
+		</SettingsSection>
+		<div v-if="loading" id="delete-my-account-loader" class="spinner-container">
+			<NcLoadingIcon :size="40" />
 		</div>
-	</SettingsSection>
+	</div>
 </template>
 
 <script>
@@ -67,6 +72,7 @@ import Axios from '@nextcloud/axios'
 import { generateUrl } from '@nextcloud/router'
 import { showError } from '@nextcloud/dialogs'
 import CheckboxRadioSwitch from '@nextcloud/vue/dist/Components/NcCheckboxRadioSwitch.js'
+import NcLoadingIcon from '@nextcloud/vue/dist/Components/NcLoadingIcon.js'
 
 const APPLICATION_NAME = 'ecloud-accounts'
 
@@ -75,6 +81,7 @@ export default {
 	components: {
 		SettingsSection,
 		CheckboxRadioSwitch,
+		NcLoadingIcon,
 	},
 	data() {
 		return {
@@ -86,6 +93,7 @@ export default {
 			showError: false,
 			allowDelete: true,
 			ordersDescription: '',
+			loading: true,
 		}
 	},
 	computed: {
@@ -172,6 +180,7 @@ export default {
 					this.allowDelete = false
 				}
 			}
+			this.loading = false
 			this.disableOrEnableDeleteAccount()
 		},
 		async updateDeleteShopPreference() {
@@ -211,6 +220,9 @@ export default {
 			if (document.activeElement === event.target) {
 				return
 			}
+			if (!this.shopEmailPostDelete || this.shopEmailPostDelete.trim() === '') {
+				return
+			}
 			if (this.shopEmailPostDelete === this.userEmail) {
 				showError(
 					t(
@@ -283,4 +295,17 @@ input#shop-alternate-email:disabled {
 #delete-account-settings .checkbox-radio-switch--disabled .checkbox-radio-switch__label:hover{
 	background-color: unset;
 }
+.spinner-container {
+	display: flex;
+	justify-content: center;
+	align-items: center;
+	height: 100px;
+	margin-top: 50px;
+}
+
+#delete-my-account-loader {
+	margin-left: auto;
+	margin-right: auto;
+	width: 40px;
+}
 </style>
diff --git a/src/delete-account-listeners.js b/src/delete-account-listeners.js
index f5461b735521e1336a194a1d6646af977db44e2d..99bb0aa03538dfd99c52ada8538f6e2719b9c85a 100644
--- a/src/delete-account-listeners.js
+++ b/src/delete-account-listeners.js
@@ -4,16 +4,23 @@ document.addEventListener('DOMContentLoaded', function() {
 	const checkboxSpanSelector = '#delete-account-settings span.checkbox-radio-switch'
 	const disabledClass = 'checkbox-radio-switch--disabled'
 	const deleteAccountSectionId = '#delete-account-settings-section'
+	const deleteMyAccountLoader = document.querySelector('#delete-my-account-loader')
 	// Disable initially
 	document.querySelector(checkboxSelector).disabled = true
 	document.querySelector(buttonSelector).disabled = true
 	document.querySelector(checkboxSpanSelector).classList.add(disabledClass)
 
 	const elem = document.getElementById('body-settings')
+	if (deleteMyAccountLoader) {
+		deleteMyAccountLoader.style.display = 'block'
+	}
 	elem.addEventListener('disable-delete-account', function() {
 	  document.querySelector(checkboxSelector).disabled = true
 	  document.querySelector(buttonSelector).disabled = true
 	  document.querySelector(checkboxSpanSelector).classList.add(disabledClass)
+	  if (deleteMyAccountLoader) {
+			deleteMyAccountLoader.style.display = 'block'
+		}
 	  document.querySelector(deleteAccountSectionId).style.visibility = 'hidden'
 	})
 
@@ -22,6 +29,9 @@ document.addEventListener('DOMContentLoaded', function() {
 	  const enableDeleteAccount = document.querySelector(checkboxSelector).checked
 	  document.querySelector(buttonSelector).disabled = !enableDeleteAccount
 	  document.querySelector(checkboxSpanSelector).classList.remove(disabledClass)
+	  if (deleteMyAccountLoader) {
+			deleteMyAccountLoader.style.display = 'none'
+		}
 	  document.querySelector(deleteAccountSectionId).style.visibility = 'visible'
 	})
 })