Fix broken messages on account creation / login for watchlist

Bug: 60048
Change-Id: I9bcc3d2eb9212cd3bd75d4d8c2675acca34be8c0
Merge "Fix broken messages on account creation / login for watchlist"