diff --git a/app/src/main/kotlin/cloud/keyspace/android/AddCard.kt b/app/src/main/kotlin/cloud/keyspace/android/AddCard.kt
index ae76dd5..4d58933 100644
--- a/app/src/main/kotlin/cloud/keyspace/android/AddCard.kt
+++ b/app/src/main/kotlin/cloud/keyspace/android/AddCard.kt
@@ -392,7 +392,7 @@ class AddCard : AppCompatActivity() {
         else if (toDate.text.toString().isEmpty()) toDate.error = "Enter an expiry date"
         else if (cardholderNameInput.text.toString().isEmpty()) cardholderNameInput.error = "Enter card holder's name"
         else if (nameInput.text.toString().isEmpty()) nameInput.error = "Enter a name. This can be your bank's name."
-        else if (isAtmCard.isChecked && atmPinInput.text.toString().length < 4) atmPinInput.error = "Enter a valid Personal Identification Number"
+        else if (isAtmCard.isChecked && atmPinInput.text.toString().length !in 4..6) atmPinInput.error = "Enter a valid Personal Identification Number"
 
         else {
 
@@ -411,7 +411,7 @@ class AddCard : AppCompatActivity() {
                 cardholderName = cardholderNameInput.text.toString(),
                 expiry = toDate.text.toString(),
                 notes = notesInput.text.toString(),
-                pin = if (atmPinInput.text.toString().length == 4 && isAtmCard.isChecked) atmPinInput.text.toString() else "",
+                pin = if (atmPinInput.text.toString().length == 4 && isAtmCard.isChecked) atmPinInput.text.toString() else null,
                 securityCode = securityCode.text.toString(),
                 customFields = customFieldsData,
                 rfid = hasRfidChip.isChecked,
diff --git a/app/src/main/res/layout/edit_card.xml b/app/src/main/res/layout/edit_card.xml
index c0d99ad..6094ebc 100644
--- a/app/src/main/res/layout/edit_card.xml
+++ b/app/src/main/res/layout/edit_card.xml
@@ -346,7 +346,7 @@
                             android:digits="0123456789"
                             android:fontFamily="monospace"
                             android:inputType="none|phone"
-                            android:maxLength="4" />
+                            android:maxLength="6" />
 
                     </com.google.android.material.textfield.TextInputLayout>