Fix bad merge. updated login header implementation