Password change & expert validation refactoring

Can this return "Current password incorrect." rather than just "Password incorrect." ? (The user interface has 3 password fields)