fix issue 1 with admin user