diff --git a/migration/i1.0z/oracle/201309302132_IDEMPIERE-1411.sql b/migration/i1.0z/oracle/201309302132_IDEMPIERE-1411.sql
index 434a812d4c..e1ab8ea2f7 100644
--- a/migration/i1.0z/oracle/201309302132_IDEMPIERE-1411.sql
+++ b/migration/i1.0z/oracle/201309302132_IDEMPIERE-1411.sql
@@ -1,14 +1,24 @@
-SET SQLBLANKLINES ON
-SET DEFINE OFF
-
 -- Sep 30, 2013 9:31:17 PM COT
 -- IDEMPIERE-1411 Delete unused roles
-DELETE FROM AD_Role WHERE AD_Role_ID=50002
+DELETE FROM AD_Window_Access WHERE AD_Role_ID IN (50001,50002)
 ;
 
--- Sep 30, 2013 9:31:32 PM COT
--- IDEMPIERE-1411 Delete unused roles
-DELETE FROM AD_Role WHERE AD_Role_ID=50001
+DELETE FROM AD_Process_Access WHERE AD_Role_ID IN (50001,50002)
+;
+
+DELETE FROM AD_Form_Access WHERE AD_Role_ID IN (50001,50002)
+;
+
+DELETE FROM AD_WorkFlow_Access WHERE AD_Role_ID IN (50001,50002)
+;
+
+DELETE FROM AD_Document_Action_Access WHERE AD_Role_ID IN (50001,50002)
+;
+
+DELETE FROM AD_InfoWindow_Access WHERE AD_Role_ID IN (50001,50002)
+;
+
+DELETE FROM AD_Role WHERE AD_Role_ID IN (50001,50002)
 ;
 
 SELECT register_migration_script('201309302132_IDEMPIERE-1411.sql') FROM dual
diff --git a/migration/i1.0z/postgresql/201309302132_IDEMPIERE-1411.sql b/migration/i1.0z/postgresql/201309302132_IDEMPIERE-1411.sql
index bbf50608b5..e1ab8ea2f7 100644
--- a/migration/i1.0z/postgresql/201309302132_IDEMPIERE-1411.sql
+++ b/migration/i1.0z/postgresql/201309302132_IDEMPIERE-1411.sql
@@ -1,11 +1,24 @@
 -- Sep 30, 2013 9:31:17 PM COT
 -- IDEMPIERE-1411 Delete unused roles
-DELETE FROM AD_Role WHERE AD_Role_ID=50002
+DELETE FROM AD_Window_Access WHERE AD_Role_ID IN (50001,50002)
 ;
 
--- Sep 30, 2013 9:31:32 PM COT
--- IDEMPIERE-1411 Delete unused roles
-DELETE FROM AD_Role WHERE AD_Role_ID=50001
+DELETE FROM AD_Process_Access WHERE AD_Role_ID IN (50001,50002)
+;
+
+DELETE FROM AD_Form_Access WHERE AD_Role_ID IN (50001,50002)
+;
+
+DELETE FROM AD_WorkFlow_Access WHERE AD_Role_ID IN (50001,50002)
+;
+
+DELETE FROM AD_Document_Action_Access WHERE AD_Role_ID IN (50001,50002)
+;
+
+DELETE FROM AD_InfoWindow_Access WHERE AD_Role_ID IN (50001,50002)
+;
+
+DELETE FROM AD_Role WHERE AD_Role_ID IN (50001,50002)
 ;
 
 SELECT register_migration_script('201309302132_IDEMPIERE-1411.sql') FROM dual