Feature/club 301 user popup fix