this is a big issue, it involves handling both the user and the organization module according to the way we talked about