Merge "Fixes multi-user support"