Fix message task running twice + adjust register message