diff --git a/src/main/java/ru/nbch/credit_tracker/builder/PersonFactoryBuilderV2.java b/src/main/java/ru/nbch/credit_tracker/builder/PersonFactoryBuilderV2.java
index 2b2d028..0103e1e 100644
--- a/src/main/java/ru/nbch/credit_tracker/builder/PersonFactoryBuilderV2.java
+++ b/src/main/java/ru/nbch/credit_tracker/builder/PersonFactoryBuilderV2.java
@@ -55,7 +55,7 @@ public class PersonFactoryBuilderV2 {
 
         person.setPn(passportData.getSerNum());
         person.setPd(DATE_FORMAT.format(LocalDate.now())); // Do not use passport iss_date. Signal service could reject the package
-        person.setDt(getDt(passportData.getIdType(), passportData.getIdType2()));
+        person.setDt(passportData.getIdType());
         if (person.getDt() != null && person.getDt().equals("999")) {
             person.setOdt(ODT);
             person.setConsentOdt(ODT);
diff --git a/src/main/java/ru/nbch/credit_tracker/service/indic/PersonServiceV2.java b/src/main/java/ru/nbch/credit_tracker/service/indic/PersonServiceV2.java
index a216a5b..b12b7e8 100644
--- a/src/main/java/ru/nbch/credit_tracker/service/indic/PersonServiceV2.java
+++ b/src/main/java/ru/nbch/credit_tracker/service/indic/PersonServiceV2.java
@@ -64,7 +64,7 @@ public class PersonServiceV2 {
      */
     public Map<String, Name> findNameByNumber(List<SubjectProfile> subjects) {
         List<String> phones = subjects.stream()
-            .map(subject -> CTUtil.normalizePhoneNumber(subject.getPhone().toString()))
+            .map(subject -> CTUtil.normalizePhoneNumber(subject.getPhone()))
             .toList();
 
         List<Name> names = mapper.findNameData(phones);
diff --git a/src/main/java/ru/nbch/credit_tracker/service/task/impl/FidNameEnricher.java b/src/main/java/ru/nbch/credit_tracker/service/task/impl/FidNameEnricher.java
index 360b078..f2e66e8 100644
--- a/src/main/java/ru/nbch/credit_tracker/service/task/impl/FidNameEnricher.java
+++ b/src/main/java/ru/nbch/credit_tracker/service/task/impl/FidNameEnricher.java
@@ -72,7 +72,7 @@ public class FidNameEnricher implements Handler<SubjectPayload, SubjectPayload>
                 fillByCache(subject, cachedRecords.get(phone));
             } else {
                 cacheMisses.incrementAndGet();
-                Name name = nameByPhone.get(CTUtil.normalizePhoneNumber(phone.toString()));
+                Name name = nameByPhone.get(CTUtil.normalizePhoneNumber(phone));
                 if (name == null) {
                     return Stream.of(PhonesMap.builder()
                         .phone(phone)
diff --git a/src/main/java/ru/nbch/credit_tracker/service/task/impl/FidNameUpdater.java b/src/main/java/ru/nbch/credit_tracker/service/task/impl/FidNameUpdater.java
index a507bf9..885cd50 100644
--- a/src/main/java/ru/nbch/credit_tracker/service/task/impl/FidNameUpdater.java
+++ b/src/main/java/ru/nbch/credit_tracker/service/task/impl/FidNameUpdater.java
@@ -40,7 +40,7 @@ public class FidNameUpdater implements Handler<SubjectPayload, SubjectPayload> {
         List<SubjectProfile> changingFidPhones = new ArrayList<>();
         List<Long> notFoundFidPhones = new ArrayList<>();
         subjects.forEach(subjectProfile -> {
-            Name name = nameByPhone.get(CTUtil.normalizePhoneNumber(subjectProfile.getPhone().toString()));
+            Name name = nameByPhone.get(CTUtil.normalizePhoneNumber(subjectProfile.getPhone()));
             if (name == null) {
                 notFoundFidPhones.add(subjectProfile.getPhone());
             } else if (!subjectProfile.getFid().equals(name.getFid())) {
diff --git a/src/main/java/ru/nbch/credit_tracker/service/task/impl/FidUpdateNameEnricher.java b/src/main/java/ru/nbch/credit_tracker/service/task/impl/FidUpdateNameEnricher.java
index 01cb936..199d851 100644
--- a/src/main/java/ru/nbch/credit_tracker/service/task/impl/FidUpdateNameEnricher.java
+++ b/src/main/java/ru/nbch/credit_tracker/service/task/impl/FidUpdateNameEnricher.java
@@ -56,7 +56,7 @@ public class FidUpdateNameEnricher implements Handler<SubjectPayload, SubjectPay
         Map<String, Name> nameByPhone = personService.findNameByNumber(subjects);
 
         List<PhonesMap> subjectForSave = subjects.stream().flatMap(subject -> {
-                Name name = nameByPhone.get(CTUtil.normalizePhoneNumber(subject.getPhone().toString()));
+                Name name = nameByPhone.get(CTUtil.normalizePhoneNumber(subject.getPhone()));
                 if (name == null) {
                     //todo set fid to null
                     return Stream.of(PhonesMap.builder()
diff --git a/src/main/java/ru/nbch/credit_tracker/utils/CTUtil.java b/src/main/java/ru/nbch/credit_tracker/utils/CTUtil.java
index 969fbd0..93716a2 100644
--- a/src/main/java/ru/nbch/credit_tracker/utils/CTUtil.java
+++ b/src/main/java/ru/nbch/credit_tracker/utils/CTUtil.java
@@ -98,8 +98,8 @@ public class CTUtil {
         }
     }
 
-    public static String normalizePhoneNumber(String phoneNumber) {
-        return "9" + phoneNumber;
+    public static String normalizePhoneNumber(Long phoneNumber) {
+        return "9" + String.format("%09d", phoneNumber);
     }
 
     public static String defineIdType(String idType, String idType2) {
diff --git a/src/main/resources/mybatis/mapper/signal/UserPackageMapper.xml b/src/main/resources/mybatis/mapper/signal/UserPackageMapper.xml
index f78ef0d..42bac9a 100644
--- a/src/main/resources/mybatis/mapper/signal/UserPackageMapper.xml
+++ b/src/main/resources/mybatis/mapper/signal/UserPackageMapper.xml
@@ -65,7 +65,7 @@
     <select id="insertPackage" resultType="java.lang.Long"
             parameterType="ru.nbch.credit_tracker.entities.app.UserPackage">
         INSERT INTO signals_user_packages (membercode, package_name, signal_types,  created_at, status, external_package_name)
-        values (#{userPackage.userId}, #{userPackage.packageName}, #{userPackage.signalTypes}, #{userPackage.createdAt}, #{userPackage.status}, concat(substring(#{serPackage.userId}, 1, 6), , '_', #{userPackage.packageName})) RETURNING id
+        values (#{userPackage.userId}, #{userPackage.packageName}, #{userPackage.signalTypes}, #{userPackage.createdAt}, #{userPackage.status}, concat(substring(#{userPackage.userId}, 1, 6), '_', #{userPackage.packageName})) RETURNING id
     </select>
 
     <update id="updatePackageStatus">