Fixing the Join/Login logic on the app
Fixed logout