Moving function and adding awareness of {USER} to notification condition...

This is live in ESAT now.