Fixed Log In and Log Out issues