Prune login page and ws fix in signup page

Change-Id: I58832f905472d936735007cb9a305c069ca1a216
Merge "Prune login page and ws fix in signup page"