Stop using BaseUserForm to set the wrong instance.user [MJ-892]

All tests pass.