Use correct validation

Fixes rhbz#912006

Change-Id: I6e229676cdd5639fe30ad0ddd39950902600ed0f
Merge "Use correct validation"