Minor forgotten password bug fixes, template options cleanup
Merge branch 'master' of github.com:botskonet/aspen-framework