reorder intarget scripts and fix user creation