Fix user check in remotes