diff --git a/fints4javaAndroidApp/src/main/java/net/dankito/banking/fints4java/android/mapper/fints4javaModelMapper.kt b/fints4javaAndroidApp/src/main/java/net/dankito/banking/fints4java/android/mapper/fints4javaModelMapper.kt
index f9140cbb..5a7d220f 100644
--- a/fints4javaAndroidApp/src/main/java/net/dankito/banking/fints4java/android/mapper/fints4javaModelMapper.kt
+++ b/fints4javaAndroidApp/src/main/java/net/dankito/banking/fints4java/android/mapper/fints4javaModelMapper.kt
@@ -78,8 +78,9 @@ open class fints4javaModelMapper {
 
     open fun mapTanProcedureType(type: net.dankito.fints.model.TanProcedureType): TanProcedureType {
         return when (type) {
-            net.dankito.fints.model.TanProcedureType.EnterTan -> TanProcedureType.EnterTan // TODO: add ChipTanManuell
-            net.dankito.fints.model.TanProcedureType.ChipTan -> TanProcedureType.ChipTanOptisch
+            net.dankito.fints.model.TanProcedureType.EnterTan -> TanProcedureType.EnterTan
+            net.dankito.fints.model.TanProcedureType.ChipTanManuell -> TanProcedureType.ChipTanManuell
+            net.dankito.fints.model.TanProcedureType.ChipTanOptisch -> TanProcedureType.ChipTanOptisch
             net.dankito.fints.model.TanProcedureType.ChipTanQrCode -> TanProcedureType.ChipTanQrCode
             net.dankito.fints.model.TanProcedureType.PhotoTan -> TanProcedureType.PhotoTan
             net.dankito.fints.model.TanProcedureType.SmsTan -> TanProcedureType.SmsTan
@@ -129,8 +130,8 @@ open class fints4javaModelMapper {
     open fun mapTanProcedureTypeBack(type: TanProcedureType): net.dankito.fints.model.TanProcedureType {
         return when (type) {
             TanProcedureType.EnterTan -> net.dankito.fints.model.TanProcedureType.EnterTan
-            TanProcedureType.ChipTanManuell -> net.dankito.fints.model.TanProcedureType.EnterTan // TODO: add ChipTanManuell
-            TanProcedureType.ChipTanOptisch -> net.dankito.fints.model.TanProcedureType.ChipTan
+            TanProcedureType.ChipTanManuell -> net.dankito.fints.model.TanProcedureType.ChipTanManuell
+            TanProcedureType.ChipTanOptisch -> net.dankito.fints.model.TanProcedureType.ChipTanOptisch
             TanProcedureType.ChipTanQrCode -> net.dankito.fints.model.TanProcedureType.ChipTanQrCode
             TanProcedureType.PhotoTan -> net.dankito.fints.model.TanProcedureType.PhotoTan
             TanProcedureType.SmsTan -> net.dankito.fints.model.TanProcedureType.SmsTan
diff --git a/fints4javaLib/src/main/kotlin/net/dankito/fints/FinTsClient.kt b/fints4javaLib/src/main/kotlin/net/dankito/fints/FinTsClient.kt
index d89c0eaa..e92a8f98 100644
--- a/fints4javaLib/src/main/kotlin/net/dankito/fints/FinTsClient.kt
+++ b/fints4javaLib/src/main/kotlin/net/dankito/fints/FinTsClient.kt
@@ -728,7 +728,8 @@ open class FinTsClient @JvmOverloads constructor(
             nameLowerCase.contains("chiptan") -> {
                 return when {
                     nameLowerCase.contains("qr") -> TanProcedureType.ChipTanQrCode
-                    else -> TanProcedureType.ChipTan
+                    nameLowerCase.contains("manuell") -> TanProcedureType.ChipTanManuell
+                    else -> TanProcedureType.ChipTanOptisch
                 }
             }
 
diff --git a/fints4javaLib/src/main/kotlin/net/dankito/fints/model/TanProcedureType.kt b/fints4javaLib/src/main/kotlin/net/dankito/fints/model/TanProcedureType.kt
index 6f9d8872..94f1c73d 100644
--- a/fints4javaLib/src/main/kotlin/net/dankito/fints/model/TanProcedureType.kt
+++ b/fints4javaLib/src/main/kotlin/net/dankito/fints/model/TanProcedureType.kt
@@ -5,7 +5,9 @@ enum class TanProcedureType {
 
     EnterTan,
 
-    ChipTan,
+    ChipTanManuell,
+
+    ChipTanOptisch,
 
     ChipTanQrCode,