Windows Desktop Search

I am using Windows XP SP2 and Office 2007 Beta 2 (RC1) - all Up to date.

When I started Desktop Search I added a number of other Directories to be
indexed including some on other Partitions (G Drive etc). Search successfully
index 30,000+ Documents and works fine.

If I reboot the System - it appears to lose the Index - noting only 2500
Documents indexed - and the List of Indexed Locations returns to the Default
of Outlook and not those that I added.

Any suggestions as only workaround is to re-index every time I start the
machine.

Is this a Office 2007 Beta Issue or Desktop Search