diff --git a/app/views/issues/_send_to_menu.html.erb b/app/views/issues/_send_to_menu.html.erb
index 251873c71..1c2ee07a9 100644
--- a/app/views/issues/_send_to_menu.html.erb
+++ b/app/views/issues/_send_to_menu.html.erb
@@ -8,15 +8,28 @@
     %>
   <% end %>
 <% end %>
-<% unless defined?(Dradis::Pro) && defined?(Dradis::Pro::Issuelib) %>
-  <% if sync_plugins.any? %>
-  <div class="divider"></div>
-  <% end %>
-  <a href="javascript:void(0)" class="js-try-pro dropdown-item" data-term="issuelib" data-url="https://dradisframework.com/pro/pages/issuelib.html"><i class="fa fa-book fa-fw"></i> Built-in IssueLibrary</a>
+
+<% if sync_plugins.any? %>
+<div class="divider"></div>
+<% end %>
+
+<% unless defined?(Dradis::Pro) && defined?(Dradis::Pro::Plugins::Issuelib) %>
+  <a href="javascript:void(0)" class="js-try-pro dropdown-item" data-term="issuelib" data-url="https://dradisframework.com/pro/pages/issuelib.html"><i class="fa fa-book fa-fw"></i> IssueLibrary for reuse</a>
 <% end %>
 <% unless defined?(Dradis::Pro) && defined?(Dradis::Pro::Plugins::Remediationtracker) %>
-  <% if sync_plugins.any? %>
-  <div class="divider"></div>
+  <a href="javascript:void(0)" class="js-try-pro dropdown-item" data-term="remediation" data-url="https://dradisframework.com/tools/remediation.html"><i class="fa fa-check-square-o fa-fw"></i> Built-in Remediation Tracker</a>
+<% end %>
+
+<% if defined?(Dradis::Pro)%>
+  <a href="https://dradisframework.com/integrations/?&plan=remediate" class="dropdown-item"><i class="fa fa-external-link fa-fw"></i> More ticketing integrations</a>
+<% else %>
+  <% unless defined?(Dradis::Pro) && defined?(Dradis::Plugins::Vsts) %>
+    <a href="javascript:void(0)" class="js-try-pro dropdown-item" data-term="devops" data-url="https://dradisframework.com/pro/add-ons/azure-devops.html"><i class="fa fa-bolt fa-fw"></i> Ticketing: Azure DevOps</a>
+  <% end %>
+  <% unless defined?(Dradis::Pro) && defined?(Dradis::Plugins::Jira) %>
+    <a href="javascript:void(0)" class="js-try-pro dropdown-item" data-term="jira" data-url="https://dradisframework.com/pro/add-ons/jira.html"><i class="fa fa-bolt fa-fw"></i> Ticketing: JIRA</a>
+  <% end %>
+  <% unless defined?(Dradis::Pro) && defined?(Dradis::Plugins::Vsts) %>
+    <a href="javascript:void(0)" class="js-try-pro dropdown-item" data-term="snow" data-url="https://dradisframework.com/integrations/servicenow.html"><i class="fa fa-bolt fa-fw"></i> Ticketing: ServiceNow</a>
   <% end %>
-  <a href="javascript:void(0)" class="js-try-pro dropdown-item" data-term="remediation" data-url="https://dradisframework.com/pro/add-ons/remediation.html"><i class="fa fa-tasks fa-fw"></i> Built-in Remediation Tracker</a>
 <% end %>
diff --git a/lib/tasks/templates/project.xml b/lib/tasks/templates/project.xml
index 12fc6dd88..eabd99816 100644
--- a/lib/tasks/templates/project.xml
+++ b/lib/tasks/templates/project.xml
@@ -39,7 +39,7 @@ The core concepts you need to know about:
         </note>
         <note>
           <id>2</id>
-          <author>adama@dradisframework.com</author>
+          <author>helo@dradisframework.com</author>
           <category-id>2</category-id>
           <text><![CDATA[#[Title]#
 1.- Adding Issues
@@ -78,7 +78,7 @@ https://dradisframework.com/support/guides/projects/index.html
         </note>
         <note>
           <id>3</id>
-          <author>adama@dradisframework.com</author>
+          <author>helo@dradisframework.com</author>
           <category-id>2</category-id>
           <text><![CDATA[#[Title]#
 2.- Adding Evidence
@@ -97,7 +97,7 @@ You can also add "images/screenshots and captions":https://dradisframework.com/s
         </note>
         <note>
           <id>4</id>
-          <author>adama@dradisframework.com</author>
+          <author>starbuck@dradisframework.com</author>
           <category-id>2</category-id>
           <text><![CDATA[#[Title]#
 5.- Next steps
@@ -120,7 +120,7 @@ If you ever want to reload this sample project again:
         </note>
         <note>
           <id>18</id>
-          <author>adama@dradisframework.com</author>
+          <author>husker@dradisframework.com</author>
           <category-id>2</category-id>
           <text><![CDATA[#[Title]#
 3.- Adding Nodes
@@ -134,7 +134,7 @@ Once you have created a Node, you can add Notes or Evidence to that Node.  A Not
         </note>
         <note>
           <id>19</id>
-          <author>adama@dradisframework.com</author>
+          <author>apollo@dradisframework.com</author>
           <category-id>2</category-id>
           <text><![CDATA[#[Title]#
 4.- Working with Methodologies
@@ -334,7 +334,7 @@ n/a
       <activities>
         <activity>
           <action>update</action>
-          <user_email>adama@dradisframework.com</user_email>
+          <user_email>apollo@dradisframework.com</user_email>
           <created_at>1495866657</created_at>
         </activity>
       </activities>
@@ -385,7 +385,7 @@ phase=8.259, freq=-141.24, error=11.32]]></content>
           <activities>
             <activity>
               <action>update</action>
-              <user_email>adama@dradisframework.com</user_email>
+              <user_email>starbuck@dradisframework.com</user_email>
               <created_at>1495865942</created_at>
             </activity>
           </activities>
@@ -393,7 +393,7 @@ phase=8.259, freq=-141.24, error=11.32]]></content>
         </evidence>
         <evidence>
           <id>4</id>
-          <author>adama@dradisframework.com</author>
+          <author>boomer@dradisframework.com</author>
           <issue-id>9</issue-id>
           <content><![CDATA[#[Location]#
 /ui/warehouse/index.php
@@ -421,22 +421,22 @@ Tests performed:
           <activities>
             <activity>
               <action>create</action>
-              <user_email>adama@dradisframework.com</user_email>
+              <user_email>husker@dradisframework.com</user_email>
               <created_at>1495866591</created_at>
             </activity>
             <activity>
               <action>update</action>
-              <user_email>adama@dradisframework.com</user_email>
+              <user_email>helo@dradisframework.com</user_email>
               <created_at>1504150101</created_at>
             </activity>
             <activity>
               <action>update</action>
-              <user_email>adama@dradisframework.com</user_email>
+              <user_email>apollo@dradisframework.com</user_email>
               <created_at>1525869293</created_at>
             </activity>
             <activity>
               <action>update</action>
-              <user_email>adama@dradisframework.com</user_email>
+              <user_email>starbuck@dradisframework.com</user_email>
               <created_at>1531237536</created_at>
             </activity>
           </activities>
@@ -654,17 +654,17 @@ Scripting (Blind_Sql_Injection.script)/Blind SQL Injection
         </activity>
         <activity>
           <action>update</action>
-          <user_email>adama@dradisframework.com</user_email>
+          <user_email>starbuck@dradisframework.com</user_email>
           <created_at>1527084558</created_at>
         </activity>
         <activity>
           <action>update</action>
-          <user_email>adama@dradisframework.com</user_email>
+          <user_email>helo@dradisframework.com</user_email>
           <created_at>1530778108</created_at>
         </activity>
         <activity>
           <action>update</action>
-          <user_email>adama@dradisframework.com</user_email>
+          <user_email>boomer@dradisframework.com</user_email>
           <created_at>1531307150</created_at>
         </activity>
         <activity>
@@ -674,27 +674,27 @@ Scripting (Blind_Sql_Injection.script)/Blind SQL Injection
         </activity>
         <activity>
           <action>update</action>
-          <user_email>adama@dradisframework.com</user_email>
+          <user_email>apollo@dradisframework.com</user_email>
           <created_at>1531310233</created_at>
         </activity>
         <activity>
           <action>update</action>
-          <user_email>adama@dradisframework.com</user_email>
+          <user_email>apollo@dradisframework.com</user_email>
           <created_at>1534423619</created_at>
         </activity>
         <activity>
           <action>update</action>
-          <user_email>adama@dradisframework.com</user_email>
+          <user_email>starbuck@dradisframework.com</user_email>
           <created_at>1544632065</created_at>
         </activity>
         <activity>
           <action>update</action>
-          <user_email>adama@dradisframework.com</user_email>
+          <user_email>helo@dradisframework.com</user_email>
           <created_at>1544632294</created_at>
         </activity>
         <activity>
           <action>update</action>
-          <user_email>adama@dradisframework.com</user_email>
+          <user_email>starbuck@dradisframework.com</user_email>
           <created_at>1544632331</created_at>
         </activity>
       </activities>
@@ -735,12 +735,12 @@ nessus
       <activities>
         <activity>
           <action>update</action>
-          <user_email>adama@dradisframework.com</user_email>
+          <user_email>husker@dradisframework.com</user_email>
           <created_at>1495866298</created_at>
         </activity>
         <activity>
           <action>update</action>
-          <user_email>adama@dradisframework.com</user_email>
+          <user_email>apollo@dradisframework.com</user_email>
           <created_at>1495866319</created_at>
         </activity>
       </activities>
@@ -790,7 +790,7 @@ nessus
         </activity>
         <activity>
           <action>update</action>
-          <user_email>adama@dradisframework.com</user_email>
+          <user_email>husker@dradisframework.com</user_email>
           <created_at>1495866279</created_at>
         </activity>
       </activities>
@@ -841,7 +841,7 @@ ntp-clock-variables-disclosure
       <activities>
         <activity>
           <action>update</action>
-          <user_email>adama@dradisframework.com</user_email>
+          <user_email>starbuck@dradisframework.com</user_email>
           <created_at>1495866053</created_at>
         </activity>
       </activities>
@@ -880,17 +880,17 @@ qualys
       <activities>
         <activity>
           <action>update</action>
-          <user_email>adama@dradisframework.com</user_email>
+          <user_email>helo@dradisframework.com</user_email>
           <created_at>1495865750</created_at>
         </activity>
         <activity>
           <action>update</action>
-          <user_email>adama@dradisframework.com</user_email>
+          <user_email>boomer@dradisframework.com</user_email>
           <created_at>1495866234</created_at>
         </activity>
         <activity>
           <action>update</action>
-          <user_email>adama@dradisframework.com</user_email>
+          <user_email>husker@dradisframework.com</user_email>
           <created_at>1500144827</created_at>
         </activity>
       </activities>
@@ -965,7 +965,7 @@ qualys
       <activities>
         <activity>
           <action>update</action>
-          <user_email>adama@dradisframework.com</user_email>
+          <user_email>apollo@dradisframework.com</user_email>
           <created_at>1495866407</created_at>
         </activity>
       </activities>
@@ -1081,7 +1081,7 @@ qualys
       <activities>
         <activity>
           <action>update</action>
-          <user_email>adama@dradisframework.com</user_email>
+          <user_email>starbuck@dradisframework.com</user_email>
           <created_at>1495866203</created_at>
         </activity>
       </activities>
diff --git a/lib/tasks/thor/setup.rb b/lib/tasks/thor/setup.rb
index 33a1ada40..12a10f568 100644
--- a/lib/tasks/thor/setup.rb
+++ b/lib/tasks/thor/setup.rb
@@ -92,9 +92,14 @@ def welcome
       # ---------------------------------------------------------- Project data
       detect_and_set_project_scope
 
+      # Template users
+      %w{adama husker halo starbuck boomer apollo}.each do |callsign|
+        User.create!(email: "#{callsign}@dradisframework.com")
+      end
+
       task_options.merge!(
         plugin: Dradis::Plugins::Projects::Upload::Template,
-        default_user_id: User.create!(email: 'adama@dradisframework.com').id
+        default_user_id: User.first.id
       )
 
       importer = Dradis::Plugins::Projects::Upload::Template::Importer.new(task_options)