1280 Commits (CLDC-1963-fix-reset-password-bugs)