User management

+ Small Fixes