added features for Join and Login