diff --git a/app/controllers/setup/kits_controller.rb b/app/controllers/setup/kits_controller.rb
index ce4d3f0d3..ce0b8df40 100644
--- a/app/controllers/setup/kits_controller.rb
+++ b/app/controllers/setup/kits_controller.rb
@@ -8,13 +8,12 @@ def new
     def create
       case @kit
       when :none
-        # weaksauce alert: this creates a Node which flags the Setup as done.
-        Project.new.issue_library
+        mark_as_done
       when :welcome
-        kit_folder = Rails.root.join('lib','tasks', 'templates','welcome').to_s
+        kit_folder = Rails.root.join('lib', 'tasks', 'templates', 'welcome').to_s
         logger = Log.new.info('Loading Welcome kit...')
         # Before we import the Kit we need at least 1 user
-        User.create!(email: 'adama@dradisframework.com')
+        User.create!(email: 'adama@dradisframework.com') unless defined?(Dradis::Pro)
         KitImportJob.perform_later(kit_folder, logger: logger)
       end
 
@@ -24,9 +23,22 @@ def create
 
     private
     def ensure_pristine
+      defined?(Dradis::Pro) ? ensure_pristine_pro : ensure_pristine_ce
+    end
+
+    def ensure_pristine_ce
       redirect_to project_path(1) unless Node.count.zero?
     end
 
+    def mark_as_done
+      defined?(Dradis::Pro) ? mark_as_done_pro : mark_as_done_ce
+    end
+
+    def mark_as_done_ce
+      # weaksauce alert: this creates a Node which flags the Setup as done.
+      Project.new.issue_library
+    end
+
     def set_kit
       if %w{none welcome}.include?(params[:kit])
         @kit = params[:kit].to_sym
diff --git a/config/routes.rb b/config/routes.rb
index 5cddb6b12..fec0a43cd 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -144,9 +144,9 @@
   namespace :setup, only: [:index] do
     if defined?(Dradis::Pro)
     else
-      resource :kit, only: [:new, :create]
       resource :password, only: [:new, :create]
     end
+    resource :kit, only: [:new, :create]
   end
 
   resources :subscriptions, only: [:index, :create, :destroy]