OOIION-1151; permit users to edit their account settings
Merge pull request #1266 from pkediyal/OOIION-1151

OOIION-1151; permit users to edit their account settings