fix redirect logic and view
Merge branch 'this-is-my-org' into develop