Bring fixes into untested branch

Fix the mixed up life_adminlevel_<some number> fiasco.