diff --git a/client/src/components/page-form/PageFormInput.vue b/client/src/components/page-form/PageFormInput.vue
index b4337f04..971f2ba9 100644
--- a/client/src/components/page-form/PageFormInput.vue
+++ b/client/src/components/page-form/PageFormInput.vue
@@ -6,12 +6,12 @@
       >{{ label }}</label
     >
     <component
-      :value="value"
+      :model-value="value"
       :class="classes"
       :data-cy="cyId"
       :is="type"
       :id="id"
-      @input="$emit('input', $event.target.value)"
+      @update:modelValue="$emit('input', $event.target.value)"
     />
   </div>
 </template>
diff --git a/client/src/components/ui/InputWithLabel.vue b/client/src/components/ui/InputWithLabel.vue
index 49db5a15..106884fd 100644
--- a/client/src/components/ui/InputWithLabel.vue
+++ b/client/src/components/ui/InputWithLabel.vue
@@ -2,11 +2,11 @@
   <div class="input-with-label">
     <label class="input-with-label__label">{{ label }}</label>
     <input
-      :value="value"
+      :model-value="value"
       :placeholder="placeholder"
       data-cy="input-with-label-input"
       class="skillbox-input"
-      @input="$emit('input', $event.target.value)"
+      @change:modelValue="$emit('input', $event.target.value)"
     />
   </div>
 </template>