@Lue2010 The credit that applies to solar property (Residential Energy Efficient Property Credit) is handled separately from the credit that applies to your energy-efficient hot water heater (Nonbusiness Energy Property Credit), so the $6,900 solar credit doesn't limit the credit for your hot water heater.
