Merge pull request #667 from hegek87/havoc

Starting to work on account preferences