Ticket #1480: User Alert patch