Fix Bug 890294 - Use webmaker loginapi module and update accordingly