Merge "Add ability to disable intialise accounts"