Applying account scoping

Ready to merge.