*8903* Move DAO registration inside enabled check