Multi-user fixes

refs #357