fix issue where login without return url broke stuff