Refactor New User adding script