Fix for OOIION-1014-Unable to change Account Settings