fix for Admin check & other things