Reset password signs the user in

Closes #4196
- Also cleaned up some .then(f, h) to .then(f).catch(h) in setup controller
It may not matter in this case but this will change the behavior of what errors each of those handlers catch.