[MOD] Revised user management (cont.)