Fixes to get multiuser option to work properly