Adding some checks on home redirection to organization page