Align to develop. Fix login/logout in widget apps