Replaced user_id check w/ 'system' check.
Added dino regex.