Un wonkify that user flow

Fixes #224
Fixes #219
Fixes #223
Refs #228