upstream: make parsing user@host consistently look for the last '@' in

upstream: make parsing user@host consistently look for the last '@' in #766