diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/domain/AccountNumberGenerator.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/domain/AccountNumberGenerator.java
index e97711462..3d2deb102 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/domain/AccountNumberGenerator.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/domain/AccountNumberGenerator.java
@@ -108,6 +108,11 @@ public class AccountNumberGenerator {
                 break;
 
             }
+
+            // FINERACT-590
+            // Because account_no is limited to 20 chars, we can only use the first 10 chars of prefix - trim if necessary
+            prefix = prefix.substring(0, Math.min(prefix.length(), 10));
+
             accountNumber = StringUtils.overlay(accountNumber, prefix, 0, 0);
         }
         return accountNumber;