removed encode @ on stuff different from username
avoid decode @ from url with username on it