[47950885] fix no error shown on the top in reset pasword


Include two other minor change.

Signed-off-by: Henry Chen <hchen@vmware.com>