Get the client in a potentially better way

Maybe this will fix the strange issue with it redirecting the wrong
person?