Better solution to password change