Simplified the form.
Merge branch 'account_feature'