Move user related listeners to enrich and userbundle