Rework install process with new user module in place