Merge secure login with working ko.js version