diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/security/utils/SQLBuilder.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/security/utils/SQLBuilder.java
index 98f4735e2..63052fbb6 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/security/utils/SQLBuilder.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/security/utils/SQLBuilder.java
@@ -35,7 +35,7 @@ import java.util.regex.Pattern;
  */
 public class SQLBuilder {
 
-    private final static Pattern ATOZ = Pattern.compile("[a-z]+");
+    private final static Pattern ATOZ = Pattern.compile("([a-zA-Z_][a-zA-Z0-9_-]*\\.)?[a-zA-Z_-][a-zA-Z0-9_-]*");
 
     // This holds the query string, with the '?' placeholders, but no argument values
     private final StringBuilder sb = new StringBuilder();