Fix/admin settings