remove unneccesary check
move associate with non-user test to it's own block

and use a fake userid to pass through validation