Hopefully we can use the IgUser with slight modifications in both cases account_type and user_id is missing so far.