Fixed issue where user's endpoint would be deleted if switching location was canceled.