diff --git a/Product_Manager/MainForm.vb b/Product_Manager/MainForm.vb
index e48376c..708dfe4 100644
--- a/Product_Manager/MainForm.vb
+++ b/Product_Manager/MainForm.vb
@@ -2689,8 +2689,14 @@ End_Finish:
             nudDvYear.Text = Mid(BackCode, 1, 2)
             nudDvMonth.Text = Mid(BackCode, 3, 2)
 
-            txbDvNumber.Text = FrontCode & BackCode
-            nudDvSerial.Text = Mid(BackCode, 5, 3) & Mid(BackCode, 8, 3)
+            Dim front As String = BackCode.Substring(0, 4)
+            Dim middle As String = BackCode.Substring(4, 3)
+            Dim last As String = BackCode.Substring(7, 3)
+
+            Dim swapped As String = front & last & middle
+
+            txbDvNumber.Text = FrontCode & swapped
+            nudDvSerial.Text = Mid(BackCode, 5, 6)
 
             DevModelChecking(Mid(FrontCode, 1, 1))