diff --git a/app/views/campaigns/_email_settings.html.erb b/app/views/campaigns/_email_settings.html.erb
index b605a044..18aabb06 100644
--- a/app/views/campaigns/_email_settings.html.erb
+++ b/app/views/campaigns/_email_settings.html.erb
@@ -74,7 +74,7 @@
         </div>
         <div class="col-xs-8">
           <%= ff.text_field(:phishing_url,
-                  placeholder: 'site.phishingfrenzy.local',
+                  placeholder: 'https://site.phishingfrenzy.local',
                   class: 'form-control') %>
         </div>
       </div>
diff --git a/spec/requests/campaigns_spec.rb b/spec/requests/campaigns_spec.rb
index ffe39646..a05ddba3 100644
--- a/spec/requests/campaigns_spec.rb
+++ b/spec/requests/campaigns_spec.rb
@@ -68,7 +68,6 @@
       campaign = create(:campaign)
       visit campaign_path(campaign)
       fill_in("campaign_test_email", with: "user@phishingfrenzy.local")
-      fill_in("campaign_email_settings_attributes_smtp_server", with: "smtp.secureserver.net")
       fill_in("campaign_email_settings_attributes_smtp_server_out", with: "smtpout.secureserver.net")
       fill_in("campaign_email_settings_attributes_domain", with: "phishingfrenzy.local")
       fill_in("campaign_email_settings_attributes_smtp_username", with: "user@phishingfrenzy.local")
@@ -81,7 +80,6 @@
       fill_in("campaign_campaign_settings_attributes_fqdn", with: "sub.phishingfrenzy.local")
       click_on("Save Settings")
       expect(page).to have_selector("#campaign_test_email[value='user@phishingfrenzy.local']")
-      expect(page).to have_selector("#campaign_email_settings_attributes_smtp_server[value='smtp.secureserver.net']")
       expect(page).to have_selector("#campaign_email_settings_attributes_smtp_server_out[value='smtpout.secureserver.net']")
       expect(page).to have_selector("#campaign_email_settings_attributes_domain[value='phishingfrenzy.local']")
       expect(page).to have_selector("#campaign_email_settings_attributes_smtp_username[value='user@phishingfrenzy.local']")
@@ -163,7 +161,7 @@
       select("Intel Password Checker", from: "campaign_template_id")
       click_on("Save Settings")
       click_on("Test")
-      expect(page).to have_content("Campaign test email sent")
+      expect(page).to have_content("Campaign test email queued for test")
       expect(page).to have_css("#recentBlasts > div > table > tbody > tr:nth-child(1)")
     end
 
diff --git a/vendor/templates/efax/efax.html.erb b/vendor/templates/efax/efax.html.erb
index 5a9efe28..04ebf5e8 100644
--- a/vendor/templates/efax/efax.html.erb
+++ b/vendor/templates/efax/efax.html.erb
@@ -9,7 +9,7 @@ You have received a 2 page fax at 2013-3-8 8:35:31 CST<br>
 <br>
 * Reference number for this fax is Fax_di23-208571567114-2013234<br>
 <br>
-<a href="http://<%= @url %>">Click here to view the message</a><br>
+<a href="<%= @url %>">Click here to view the message</a><br>
 <br>
 <br>
 Please visit eFax.com if you have any questions regarding this service.<br>
diff --git a/vendor/templates/intel/intel.html.erb b/vendor/templates/intel/intel.html.erb
index 92c0ea4d..55ca9a43 100644
--- a/vendor/templates/intel/intel.html.erb
+++ b/vendor/templates/intel/intel.html.erb
@@ -44,7 +44,7 @@ face=Tahoma><FONT size=2><B>Subject:</B> Strong Password Checking Tool
   non-recording feature on Intels Website that helps determine your
   password's strength as you type.<br>
   <br>
-  Visit <a href="http://<%= @url %>">https://www-ssl.intel.com/content/www/us/en/forms/passwordwin.html</a>
+  Visit <a href="<%= @url %>">https://www-ssl.intel.com/content/www/us/en/forms/passwordwin.html</a>
   to test the strength of your passwords.<br>
   <br>
   Thank you,<br>