Stack-21 - new user password change fix

Short term fix for the problem of unexpected rollbacks for new users that have not signed the terms yet.