Card #272 fix for lazy loading user features