#322 Fixed bugs in Account tab