Added clearing of all messages if we show the success message already

Reviewer: Tiff Go

Issue: none (improvement)