Change Password fixes