some refactoring and set up admin user (9.4.2)