Smoother login; need to fix logout