Only remove account attr if it's available.