Fix regression JS error on login form
Merge remote-tracking branch 'origin/master'