Merge "Tweaks to user creation intent text and error codes"