diff --git a/app/plan.rb b/app/plan.rb
index b79febd6..ee225d81 100644
--- a/app/plan.rb
+++ b/app/plan.rb
@@ -35,9 +35,6 @@ post '/plan/update' do
     end
   end
 
-  # Do not create customer if there is already a customer. Is this necessary?
-  redirect request.referrer if current_site.stripe_subscription_id
-
   site ||= parent_site
 
   DB.transaction do
diff --git a/views/plan/_signupcode.erb b/views/plan/_signupcode.erb
index 1928f470..903e69de 100644
--- a/views/plan/_signupcode.erb
+++ b/views/plan/_signupcode.erb
@@ -13,6 +13,10 @@
 
     var signupform = $(event.target)
 
+    <% if current_site && parent_site.stripe_subscription_id && !request.path.match(/\/settings/) %>
+      return true
+    <% end %>
+
     var planError = $('#plan_error')
     planError.css('display', 'none')
     signupform.find(':submit').prop('disabled', true)