Card #16 - fix for not deleting user mappings etc on switching on/off green notification