Correct issue with current user id