Removed obsolete userId override possibility