Fixed #932: Bug - Unable to switch from a redirected subdomain to normal subdomain
Small fixes