Minor changes to previous logout commit