Added validation error text to step 2 + controllers