Fix bug where @spree_user is not being set before re-displaying password edit form on blank password

Fixes #199
Fixes #198