diff --git a/vector/build.gradle b/vector/build.gradle
index e497b156ae..92e7239dbf 100644
--- a/vector/build.gradle
+++ b/vector/build.gradle
@@ -232,8 +232,7 @@ android {
     lintOptions {
         lintConfig file("lint.xml")
 
-        // TODO Restore true once pb with WorkManager is fixed
-        abortOnError false
+        abortOnError true
     }
 
     compileOptions {
diff --git a/vector/src/main/java/im/vector/riotx/features/form/FormEditTextWithButtonItem.kt b/vector/src/main/java/im/vector/riotx/features/form/FormEditTextWithButtonItem.kt
index 0650c0f55c..799f6abe00 100644
--- a/vector/src/main/java/im/vector/riotx/features/form/FormEditTextWithButtonItem.kt
+++ b/vector/src/main/java/im/vector/riotx/features/form/FormEditTextWithButtonItem.kt
@@ -56,6 +56,7 @@ abstract class FormEditTextWithButtonItem : VectorEpoxyModel<FormEditTextWithBut
     }
 
     override fun bind(holder: Holder) {
+        super.bind(holder)
         holder.textInputLayout.isEnabled = enabled
         holder.textInputLayout.hint = hint