Improved support for adding DRK after anon has completed