Still working on validation.  Found another error where users is redirected to the wrong store.