Merge "Misc fix for secondary user"