Added in user validation