Initial admin users fixes