Admin account creation fixed, code refactoring