Fixes to the admin part

@mon_sat made what looks like proper fixes, should be merged imo