Fix logins bug
fix bug
Merge branch 'message_status' into testing