Fix #31285 (cherry picked from commit 0188d82e4908eb173f7203d577f801f3168ffcb8) Conflicts: templates/user/settings/applications.tmpl