(CE-849) Fix XSS vulnerability in UserLogin extension
Merge branch 'CE-849' into dev