Issue #371 Impl. Fix for hardcoded User instantiation