fixed an issue with the non public accounts
Merge branch 'api1.2' into develop