diff --git a/APPL/MGT/mgt_genericsql.asp b/APPL/MGT/mgt_genericsql.asp
index 5ff45d71da..ba078fe35a 100644
--- a/APPL/MGT/mgt_genericsql.asp
+++ b/APPL/MGT/mgt_genericsql.asp
@@ -20,6 +20,19 @@ __Logging = 0; // Is te laat...
     Application("otap_environment") == "O" || user.checkAutorisation("WEB_FACFAC");
     var sql = getFParam("sql", getQParam("sql", ""));
 
+    // Als er exact één SELECT, FROM en WHERE is doen we een beetje formatting
+    if ((sql.match(/SELECT/ig) || []).length == 1 &&
+        (sql.match(/FROM/ig) || []).length == 1 &&
+        (sql.match(/WHERE/ig) || []).length == 1)
+    {
+        sql = sql.replace(/FROM/i, "\nFROM");
+        sql = sql.replace(/WHERE/i, "\nWHERE");
+        sql = sql.replace(/ORDER BY/i, "\nORDER BY");
+        sql = sql.replace(/GROUP BY/i, "\nGROUP BY");
+        sql = sql.replace(/ AND/ig, "\n    AND");
+    }
+
+
 /*
 //Onze SQL-statement zo maar naar een cloud-service sturen mag vast niet van ISO-27001
 if (sql && sql != "opener")