Merge "Fix issue #26102692: Unable to create secondary user..."