Join page fix