Fix change password form and popup