Fix bug 1088195 - Integrate webmaker login 3.0