Fixes some stuff.

Signed-off-by: crynobone <crynobone@gmail.com>
Refactor account.

Signed-off-by: crynobone <crynobone@gmail.com>