diff --git a/svc/queries/account.go b/svc/queries/account.go
index bb1c52d..647b314 100644
--- a/svc/queries/account.go
+++ b/svc/queries/account.go
@@ -26,7 +26,7 @@ func GetAccounts(ctx context.Context) ([]models.Account, error) {
     ;WITH VendorPiyasa AS
     (
         SELECT
-            Cari8 = LEFT(REPLACE(P.CurrAccCode, ' ', ''), 8),
+            Cari8 = LEFT(P.CurrAccCode, 8),
             VendorAtt01 = MAX(P.VendorAtt01)
         FROM
         (
@@ -53,14 +53,14 @@ func GetAccounts(ctx context.Context) ([]models.Account, error) {
             ) pvt
             GROUP BY CurrAccTypeCode, CurrAccCode
         ) P
-        GROUP BY LEFT(REPLACE(P.CurrAccCode, ' ', ''), 8)
+        GROUP BY LEFT(P.CurrAccCode, 8)
     )
     SELECT
         x.AccountCode,
         MAX(x.AccountName) AS AccountName
     FROM (
         SELECT
-            LEFT(REPLACE(b.CurrAccCode, ' ', ''), 8) AS AccountCode,
+            LEFT(b.CurrAccCode, 8) AS AccountCode,
             COALESCE(d.CurrAccDescription, '') AS AccountName
         FROM trCurrAccBook b
         LEFT JOIN cdCurrAccDesc d
@@ -71,7 +71,7 @@ func GetAccounts(ctx context.Context) ([]models.Account, error) {
             ON f2.CurrAccTypeCode = b.CurrAccTypeCode
            AND f2.CurrAccCode = b.CurrAccCode
         LEFT JOIN VendorPiyasa vp
-            ON vp.Cari8 = LEFT(REPLACE(b.CurrAccCode, ' ', ''), 8)
+            ON vp.Cari8 = LEFT(b.CurrAccCode, 8)
         WHERE b.CurrAccTypeCode IN (1,3)
           AND %s
     ) x
@@ -114,10 +114,9 @@ func formatAccountDisplayCode(code string) string {
 }
 
 func normalizeAccountCode8(code string) string {
-	trimmed := strings.TrimSpace(strings.ReplaceAll(code, " ", ""))
-	runes := []rune(trimmed)
+	runes := []rune(code)
 	if len(runes) > 8 {
 		return string(runes[:8])
 	}
-	return trimmed
+	return code
 }