diff --git a/Gemfile b/Gemfile
index aaf4e354..89ed7076 100644
--- a/Gemfile
+++ b/Gemfile
@@ -25,7 +25,7 @@ gem 'thread'
 gem 'scrypt'
 gem 'rack-cache'
 gem 'rest-client', require: 'rest_client'
-gem 'addressable'
+gem 'addressable', require: 'addressable/uri'
 gem 'paypal-recurring', require: 'paypal/recurring'
 gem 'geoip'
 gem 'io-extra', require: 'io/extra'
diff --git a/app/plan.rb b/app/plan.rb
index 0f9ab44e..1a201ae1 100644
--- a/app/plan.rb
+++ b/app/plan.rb
@@ -193,6 +193,7 @@ get '/plan/paypal/cancel' do
   ppr = PayPal::Recurring.new profile_id: parent_site.paypal_profile_id
   ppr.cancel
 
+  parent_site.plan_type = nil
   parent_site.paypal_active = false
   parent_site.paypal_profile_id = nil
   parent_site.paypal_token = nil