user module improvements & bugfixes