diff --git a/dashboard/src/views/PasswordResetView.vue b/dashboard/src/views/PasswordResetView.vue
index cecb60eb5..db54383d7 100644
--- a/dashboard/src/views/PasswordResetView.vue
+++ b/dashboard/src/views/PasswordResetView.vue
@@ -147,12 +147,12 @@ onMounted(async () => {
           <input type="submit" style="display: none;"/>
           <input type="password" style="display: none;"/>
 
-          <FormGroup :has-error="newPasswordRepeat && newPassword !== newPasswordRepeat">
+          <FormGroup :has-error="(newPasswordRepeat && newPassword !== newPasswordRepeat) ? true : null">
             <label for="inputNewPassword">{{ $t('passwordReset.newPassword.password') }}</label>
             <PasswordInput id="inputNewPassword" v-model="newPassword" autofocus required />
           </FormGroup>
 
-          <FormGroup :has-error="newPasswordRepeat && newPassword !== newPasswordRepeat">
+          <FormGroup :has-error="(newPasswordRepeat && newPassword !== newPasswordRepeat) ? true : null">
             <label for="inputNewPasswordRepeat">{{ $t('passwordReset.newPassword.passwordRepeat') }}</label>
             <PasswordInput id="inputNewPasswordRepeat" v-model="newPasswordRepeat" required />
           </FormGroup>
@@ -163,8 +163,8 @@ onMounted(async () => {
             <p class="has-error" v-if="error.totpToken">{{ error.totpToken }}</p>
           </FormGroup>
 
-          <div class="public-page-layout-button-bar">
-            <Button @click="onNewPassword()" :disabled="busy || !newPassword || newPassword !== newPasswordRepeat" :loading="busy">{{ $t('passwordReset.passwordChanged.submitAction') }}</Button>
+          <div style="margin-top: 20px">
+            <Button @click="onNewPassword()" style="margin-right: 6px" :disabled="busy || !newPassword || newPassword !== newPasswordRepeat" :loading="busy">{{ $t('passwordReset.passwordChanged.submitAction') }}</Button>
             <a href="/">{{ $t('passwordReset.backToLoginAction') }}</a>
           </div>
         </form>