diff --git a/src/Components/Modals/ModalContent.vue b/src/Components/Modals/ModalContent.vue
deleted file mode 100644
index 0f353101ef..0000000000
--- a/src/Components/Modals/ModalContent.vue
+++ /dev/null
@@ -1,57 +0,0 @@
-<template>
-	<NcContent class="modal-content" app-name="libresign">
-		<main>
-			<header>
-				<slot name="header">
-					<h2>{{ title }}</h2>
-				</slot>
-			</header>
-			<section>
-				<slot />
-			</section>
-		</main>
-	</NcContent>
-</template>
-
-<script>
-import NcContent from '@nextcloud/vue/dist/Components/NcContent.js'
-export default {
-	name: 'ModalContent',
-	components: {
-		NcContent,
-	},
-	props: {
-		title: {
-			type: String,
-			required: false,
-			default: '',
-		},
-	},
-}
-</script>
-
-<style lang="scss" scoped>
-.modal-content {
-	padding-top: 20px;
-}
-
-header, main, section {
-	width: 100%;
-}
-
-main {
-	justify-content: flex-start;
-	align-items: center;
-	margin: 0 1em;
-	width: 100%;
-	display: flex;
-	flex-direction: column;
-}
-
-header {
-	text-align: center;
-	h2 {
-		font-size: 2.5em;
-	}
-}
-</style>
diff --git a/src/views/Account/partials/ManagePassword.vue b/src/views/Account/partials/ManagePassword.vue
index e0fc6b27ce..e89e0e8390 100644
--- a/src/views/Account/partials/ManagePassword.vue
+++ b/src/views/Account/partials/ManagePassword.vue
@@ -76,6 +76,7 @@ export default {
 	},
 	setup() {
 		const signMethodsStore = useSignMethodsStore()
+		signMethodsStore.setHasSignatureFile(loadState('libresign', 'config', {})?.hasSignatureFile ?? false)
 		return { signMethodsStore }
 	},
 	data() {
diff --git a/src/views/CreatePassword.vue b/src/views/CreatePassword.vue
index cf04802e1e..627b7e3634 100644
--- a/src/views/CreatePassword.vue
+++ b/src/views/CreatePassword.vue
@@ -73,36 +73,3 @@ export default {
 	},
 }
 </script>
-<style lang="scss" scoped>
-	form{
-		display: flex;
-		flex-direction: column;
-		width: 100%;
-		max-width: 100%;
-		justify-content: center;
-		align-items: center;
-		text-align: center;
-		header{
-			font-weight: bold;
-			font-size: 20px;
-			margin-bottom: 12px;
-			line-height: 30px;
-			color: var(--color-text-light);
-		}
-	}
-
-	.container {
-		display: flex;
-		flex-direction: column;
-		align-items: center;
-		padding: 20px;
-		gap: 4px 0;
-	}
-
-	.input-group{
-		justify-content: space-between;
-		display: flex;
-		flex-direction: column;
-		width: 100%;
-	}
-</style>
diff --git a/src/views/ResetPassword.vue b/src/views/ResetPassword.vue
index fc85a0ddf6..aad003a244 100644
--- a/src/views/ResetPassword.vue
+++ b/src/views/ResetPassword.vue
@@ -19,11 +19,14 @@
 			</div>
 		</div>
 		<template #actions>
-			<button :disabled="!canSave"
+			<NcButton :disabled="!canSave"
 				:class="hasLoading ? 'btn-load loading primary btn-confirm' : 'primary btn-confirm'"
 				@click="send">
+				<template #icon>
+					<NcLoadingIcon v-if="hasLoading" :size="20" />
+				</template>
 				{{ t('libresign', 'Confirm') }}
-			</button>
+			</NcButton>
 		</template>
 	</NcDialog>
 </template>
@@ -31,6 +34,7 @@
 <script>
 import NcDialog from '@nextcloud/vue/dist/Components/NcDialog.js'
 import NcPasswordField from '@nextcloud/vue/dist/Components/NcPasswordField.js'
+import NcButton from '@nextcloud/vue/dist/Components/NcButton.js'
 import axios from '@nextcloud/axios'
 import { generateOcsUrl } from '@nextcloud/router'
 import { showError, showSuccess } from '@nextcloud/dialogs'
@@ -41,6 +45,7 @@ export default {
 	components: {
 		NcDialog,
 		NcPasswordField,
+		NcButton,
 	},
 	setup() {
 		const signMethodsStore = useSignMethodsStore()
@@ -56,7 +61,7 @@ export default {
 	},
 	computed: {
 		canSave() {
-			return this.currentPassword && this.validNewPassord
+			return this.currentPassword && this.validNewPassord && !this.hasLoading
 		},
 		validNewPassord() {
 			return this.newPassword.length > 3 && this.newPassword === this.rPassword
@@ -72,6 +77,7 @@ export default {
 				})
 				showSuccess(response.data.message)
 				this.hasLoading = false
+				this.signMethodsStore.closeModal('resetPassword')
 				this.$emit('close', true)
 			} catch (err) {
 				if (err.response.data.message) {
@@ -86,28 +92,6 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
-	form{
-		display: flex;
-		flex-direction: column;
-		width: 100%;
-		max-width: 100%;
-		margin: 50px;
-		justify-content: center;
-		align-items: center;
-		text-align: center;
-		padding: 1rem;
-		header{
-			margin-bottom: 2.5rem;
-		}
-		h1{
-			font-size: 45px;
-			margin-bottom: 1rem;
-		}
-		p{
-			font-size: 15px;
-		}
-	}
-
 	.container {
 		display: flex;
 		flex-direction: column;
@@ -119,22 +103,6 @@ export default {
 
 		text-align: start;
 	}
-
-	.btn-confirm{
-		width: 100%;
-		max-width: 280px;
-	}
-
-	.btn-load{
-		background-color: transparent !important;
-		font-size: 0;
-		pointer-events: none;
-		cursor: not-allowed;
-		margin-top: 10px;
-		border: none;
-
-	}
-
 	.input-group{
 		display: flex;
 		flex-direction: column;