Fix Error on non password changes