Fix. user-less URI handling