Fixes the problem with unexpected rollbacks for new users that have not signed the terms yet.
Merge pull request #829 from kaysoky/release-21

Stack-21 - new user password change fix