#616 Improve change password interface