Changed login flow
merged conflicts w/default.html