Reworked user management, added account management