Updated to fix issue with edit capability
Merge branch 'account_feature'