Merge pull request #673 from hegek87/havoc

Started working on account page
Merge remote-tracking branch 'upstream/havoc' into havoc