More work on Account directory and profile

Change-Id: Ief9117f5b7e48b1d833dfa0259540c95ddd8d39f