diff --git a/.editorconfig b/.editorconfig
index 9446997321..d740210478 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -19,9 +19,22 @@ ktlint_standard_annotation = disabled
 # If enabled, this rules forces any multiline assignment to the new line regardless of length
 ktlint_standard_multiline-expression-wrapping = disabled
 
+# If enabled, this rules forces braces to all branches if any single one has them
+ktlint_standard_when-entry-bracing = disabled
+
+# If enabled, this rule forces blank line between when branches if there is a single multiline branch
+ktlint_standard_blank-line-between-when-conditions = disabled
+ij_kotlin_line_break_after_multiline_when_entry = false
+
 # Default allows the expression body to be a single call to a wrapper
 # function (e.g. `runTest{}`) without a line break
 ktlint_function_signature_body_expression_wrapping = default
 
 # In tests star imports are fine since there could be lots helper functions
 ij_kotlin_packages_to_use_import_on_demand=androidx.test.**,io.mockk.**,com.google.common.truth.**
+
+# Backticked function names are only used in tests and those names can be very long
+ktlint_ignore_back_ticked_identifier=true
+
+# Unused import deletion is disabled by default due to a issue with
+ktlint_standard_no-unused-imports = enabled
diff --git a/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/view/ScannedCredentialDialog.kt b/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/view/ScannedCredentialDialog.kt
index 9fd5837eff..ad996aef1a 100644
--- a/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/view/ScannedCredentialDialog.kt
+++ b/feature/external-credential/src/main/java/com/simprints/feature/externalcredential/view/ScannedCredentialDialog.kt
@@ -52,11 +52,6 @@ class ScannedCredentialDialog(
         documentField.text = credentialField
         title.text = context.getString(IDR.string.mfid_add_document_title, credential)
         credentialValue.text = displayedCredential.value
-        confirmCredentialCheckbox.text =
-            context.getString(IDR.string.mfid_confirmation_checkbox_text, credentialField)
-        confirmCredentialCheckbox.setOnCheckedChangeListener { _, isChecked ->
-            buttonConfirm.isEnabled = isChecked
-        }
         buttonSkip.setOnClickListener { onSkip() }
         buttonConfirm.setOnClickListener { onConfirm() }
     }
diff --git a/feature/external-credential/src/main/res/layout/dialog_scanned_credential.xml b/feature/external-credential/src/main/res/layout/dialog_scanned_credential.xml
index 5a1ec274d8..4ee42c7014 100644
--- a/feature/external-credential/src/main/res/layout/dialog_scanned_credential.xml
+++ b/feature/external-credential/src/main/res/layout/dialog_scanned_credential.xml
@@ -49,22 +49,17 @@
             style="@style/Text.Headline4.Bold"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:layout_marginBottom="@dimen/margin_huge"
             android:layout_marginEnd="@dimen/margin_large"
             android:paddingHorizontal="@dimen/margin_large"
             android:textColor="@color/simprints_text_black"
             tools:text="GHA-123456789-0" />
 
-        <CheckBox
-            android:id="@+id/confirmCredentialCheckbox"
-            style="@style/Text.Body2.Secondary"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginHorizontal="10dp"
-            android:layout_marginBottom="@dimen/margin_large"
-            android:buttonTint="@color/simprints_blue"
-            android:checked="false"
-            android:paddingStart="@dimen/margin_default"
-            tools:text="I confirm that the external credential is scanned correctly" />
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:layout_marginHorizontal="@dimen/margin_large"
+            android:background="@color/simprints_grey_light" />
 
         <LinearLayout
             android:layout_width="match_parent"
@@ -84,7 +79,6 @@
             <Button
                 android:id="@+id/buttonConfirm"
                 style="@style/Widget.Simprints.Button.Blue"
-                android:enabled="false"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="@dimen/margin_large"