Changes to auth and init script