Bug fix to changes to validation screen

https://www.pivotaltracker.com/story/show/66551186
Merge pull request #131 from pfschwartz/develop

Bug fix to changes to validation screen