diff --git a/app/create.rb b/app/create.rb
index 69066662..f55dc679 100644
--- a/app/create.rb
+++ b/app/create.rb
@@ -91,6 +91,11 @@ post '/create' do
       return {result: 'error'}.to_json
     end
 
+    if defined?(BlackBox.create_disabled?) && BlackBox.create_disabled?(site, request)
+      flash[:error] = 'Site creation is currently unavailable, please try again later.'
+      return {result: 'error'}.to_json
+    end
+
     if !@site.valid?
       flash[:error] = @site.errors.first.last.first
       return {result: 'error'}.to_json
diff --git a/app/index.rb b/app/index.rb
index 0fd765ec..ceafe5d6 100644
--- a/app/index.rb
+++ b/app/index.rb
@@ -80,7 +80,7 @@ get '/?' do
     @blog_feed_html = SimpleCache.get :blog_feed_html
   end
 
-  @create_disabled = defined?(BlackBox.create_disabled?) && BlackBox.create_disabled?(request)
+  @create_disabled = false
 
   erb :index, layout: :index_layout
 end