Corrections to static user handling, fixing #5 while maintaining compatibility