Bugfixes + Users Manager