Does it look like this? If so go into BIOS (press F2) There should be an option for "Set HDD password" enter the current password and for the new password just leave it blank.
View attachment 32211
Bingo, you nailed it. and the Start up one is just like that too.