You are prolly right. It is either the Power Supply or the CPU fan. Replace one of them and check it again. I would normally say replace the CPU fan first because its the cheapist part to change, but if you have a spair Power Supply or a CPU fan you can borrow, it doesn't hurt to check both. My bet is that its the Power Supply.