Fix the logic to catch the first time association and correctly display the message in dialog
Modified various message in the dialogs