Admin User & other adjustments