Change default password, refactor