Fix for OOIION-1014-Unable to change Account Settings
Merge pull request #1138 from shenrie/master

Fix for OOIION-1014-Unable to change Account Settings