User management improved

:hand: WIP, DO NOT MERGE YET, PLEASE :hand: