Auto accept alert

fixes issue #2400

this would need to get merged into master as well.