Fixed some issues with user IDs