EB-8319 - Fix for saalfeld guest users.