Revert "Revert "Fixed bugs: payments. organization, users""

This reverts commit 8341b3a29dbac784f3df65e0246068c667e7f0c4.