fix new site dialog
Merge remote-tracking branch 'upstream/master' into usergroup_ui