Admin users fixes