diff --git a/components/CoinLockForm.vue b/components/CoinLockForm.vue
index 7d515cb6..965a0c90 100644
--- a/components/CoinLockForm.vue
+++ b/components/CoinLockForm.vue
@@ -112,7 +112,7 @@
                     <InputMaskedInteger
                         class="form-field__input" v-check-empty
                         v-model="form.dueBlock"
-                        @blur="$v.form.dueBlock.$touch()"
+                        @blur="$v.form.dueBlock.$touch(); $emit('my-blur')"
                     />
                     <span class="form-field__label">{{ $td('Due block', 'form.lock-due-block') }}</span>
                 </label>
diff --git a/components/common/InputMaskedAmount.vue b/components/common/InputMaskedAmount.vue
index 40b30c55..b0f7ad43 100644
--- a/components/common/InputMaskedAmount.vue
+++ b/components/common/InputMaskedAmount.vue
@@ -3,7 +3,6 @@
     import {IMaskDirective} from 'vue-imask';
 
     export default {
-        ideFix: null,
         imaskAmount: {
             mask: Number,
             scale: 18, // digits after point, 0 for integers
@@ -26,6 +25,9 @@
                 type: [String, Number],
             },
         },
+        emits: [
+            'input',
+        ],
         data() {
             return {
                 // inner value set by imask
@@ -41,7 +43,7 @@
             imaskOptions() {
                 return {
                     ...this.$options.imaskAmount,
-                    scale: this.scale || this.$options.imaskAmount.scale,
+                    scale: this.scale ?? this.$options.imaskAmount.scale,
                 };
             },
         },
@@ -75,5 +77,5 @@
 </script>
 
 <template>
-    <input type="text" autocapitalize="off" inputmode="decimal" v-imask="imaskOptions" v-on="listeners" @accept="onAcceptInput" ref="input"/>
+    <input type="text" autocapitalize="off" inputmode="decimal" v-imask="imaskOptions" v-on="listeners" @accept="onAcceptInput($event)" ref="input"/>
 </template>
diff --git a/components/common/InputMaskedInteger.vue b/components/common/InputMaskedInteger.vue
index af17a432..02bf60db 100644
--- a/components/common/InputMaskedInteger.vue
+++ b/components/common/InputMaskedInteger.vue
@@ -1,69 +1,34 @@
 <script>
-    import 'core-js/features/global-this.js';
-    import {IMaskDirective} from 'vue-imask';
+import InputMaskedAmount from '~/components/common/InputMaskedAmount.vue';
 
-    export default {
-        ideFix: null,
-        imaskAmount: {
-            mask: Number,
-            scale: 0, // digits after point, 0 for integers
-            signed: false,  // disallow negative
-            thousandsSeparator: '',  // any single char
-            padFractionalZeros: false,  // if true, then pads zeros at end to the length of scale
-            normalizeZeros: false, // appends or removes zeros at ends
-            radix: '.',  // fractional delimiter
-            mapToRadix: [','],  // symbols to process as radix
-        },
-        directives: {
-            imask: IMaskDirective,
-        },
-        props: {
-            value: {
-                type: [String, Number],
-                default: '',
-            },
-        },
-        data() {
-            return {
-                // inner value set by imask
-                maskedValue: '',
-            };
-        },
-        computed: {
-            // pass native events
-            inputListeners: function() {
-                let listeners = Object.assign({}, this.$listeners);
-                // input event fires separately
-                delete listeners.input;
-                return listeners;
-            },
-        },
-        watch: {
-            value(newVal) {
-                // typed value has to be updated if prop value changed programmatically
-                if (newVal !== this.maskedValue) {
-                    this.updateMaskState(newVal);
-                }
-            },
-        },
-        mounted() {
-            this.updateMaskState(this.value);
-        },
-        methods: {
-            updateMaskState(value) {
-                this.$refs.input.maskRef.typedValue = value;
-                const maskedValue = this.$refs.input.maskRef._value;
-                const cursorPos = maskedValue.length;
-                this.$refs.input.maskRef._selection = {start: cursorPos, end: cursorPos};
-            },
-            onAcceptInput(e) {
-                this.maskedValue = e.detail._unmaskedValue;
-                this.$emit('input', e.detail._unmaskedValue);
-            },
-        },
-    };
+export default {
+    components: {
+        InputMaskedAmount,
+    },
+    props: {
+        value: {
+            type: [String, Number],
+            default: '',
+        },
+    },
+    computed: {
+        // pass native events
+        inputListeners: function() {
+            let listeners = Object.assign({}, this.$listeners);
+            // input event fires separately
+            delete listeners.input;
+            return listeners;
+        },
+    },
+};
 </script>
 
 <template>
-    <input type="text" autocapitalize="off" inputmode="numeric" v-imask="$options.imaskAmount" v-on="inputListeners" @accept="onAcceptInput" ref="input"/>
+    <InputMaskedAmount
+        inputmode="numeric"
+        :value="value"
+        :scale="0"
+        v-on="inputListeners"
+        @input="$emit('input', $event)"
+    />
 </template>