Changed a merge error, it should look for the user_id and not the username