Fixed up issue with user_id