Account page fixes