Modified for Login/out