Sorry i thought you said you changed the password via the Admin account in Safe Mode. I did no realize you had changed it via the account itself.
Have you tried changing it from the Safe Mode Admin account? Does it take then? It seems to work when you revert the password back.