Added back missing js
Fix broken ajax-generated user forms
Merge remote-tracking branch 'pbs/master'