Fixed RFIs bug with current_user id