Revert "Revert "Some changes in account app.""

This reverts commit 7405c7166f865f1c5d9fdd99ef52b845e32279e3.