Watersmart 436

This fix seems to work for the problem described in WATERSMART-436, however, I'm not certain if this is the best approach.  Would appreciate if someone familiar with angular could review.