Fix message user bugs