Made the remote user check more lighter.