Manual merge of Team 2 changes to login