RMP-27 #comment added user_id to messages and changed activate/remove account link formats
RMP-27 RMP-21 #comment changes for consistency