Fixed the problem with redirects on empty sites
Temporary fix on un-authed redirects until ->goto exists
Fixed merge conflict