Account regression fix
Merge pull request #187 from GrabNetworks/accountregression

Account regression fix
Merge branch 'integration' into dev-jd