Ubuntu :: Keyboard Settings Freaking Out?

I recently changed my keyboard layout to US International so I could learn to type in French, but after that, I wanted to switch it back to plain old US default (or whatever it's called...) I went back in and changed it the same way I did the first time, and it works fine until I shut down the computer. When I log back in after booting up the computer, the keyboard layout resets itself to US Int. again. I've tried deleting it from the list, moving it down, applying normal US to the entire system, and resetting the keyboard layout to it's default state, and yet it still resets itself. Anyone know what's up? I'm running Lucid on an HP Pavilion notebook.