- if ($prefix = getPref($datadir, $user, 'addrsrch_fullname') or
- isset($addrsrch_fullname) and $prefix = $addrsrch_fullname) {
+ if (($prefix = getPref($data_dir, $username, 'addrsrch_fullname') or
+ isset($addrsrch_fullname) and $prefix = $addrsrch_fullname)
+ and $prefix !== 'noprefix') {