usersearch+userimport code changes/fixes due to function renaming and mail template