Fixing header and default account creation behaviors after merge