Merge "Fix add user tint, some people thought it was disabled"