Bug fixes to bugs that happen when adding new users