Issue #2266781 and #1965862 by japerry: Refactor realname menu paths patch to fix autocomplete from erroring out