diff --git a/app/controllers/finish_installation_controller.rb b/app/controllers/finish_installation_controller.rb
index 7e6b8c4d3b3..01bbf5bfccb 100644
--- a/app/controllers/finish_installation_controller.rb
+++ b/app/controllers/finish_installation_controller.rb
@@ -2,7 +2,7 @@ class FinishInstallationController < ApplicationController
   skip_before_filter :check_xhr, :preload_json, :redirect_to_login_if_required
   layout 'finish_installation'
 
-  before_filter :ensure_no_admins, except: ['confirm_email']
+  before_filter :ensure_no_admins, except: ['confirm_email', 'resend_email']
 
   def index
   end
@@ -35,6 +35,17 @@ class FinishInstallationController < ApplicationController
     @email = session[:registered_email]
   end
 
+  def resend_email
+    @email = session[:registered_email]
+    @user = User.where(email: @email).first
+    if @user.present?
+      @email_token = @user.email_tokens.unconfirmed.active.first
+      if @email_token.present?
+        Jobs.enqueue(:critical_user_email, type: :signup, user_id: @user.id, email_token: @email_token.token)
+      end
+    end
+  end
+
   protected
 
     def redirect_confirm(email)
diff --git a/app/views/finish_installation/confirm_email.html.erb b/app/views/finish_installation/confirm_email.html.erb
index 73f2a381684..9d15c3621ae 100644
--- a/app/views/finish_installation/confirm_email.html.erb
+++ b/app/views/finish_installation/confirm_email.html.erb
@@ -1,3 +1,9 @@
-<h1><%= t 'first_installation.confirm_email.title' %></h1>
+<h1><%= t 'finish_installation.confirm_email.title' %></h1>
 
-<%= raw(t 'first_installation.confirm_email.message', email: @email) %>
+<%= raw(t 'finish_installation.confirm_email.message', email: @email) %>
+
+<div class='row'>
+  <%= button_to(finish_installation_resend_email_path, method: :put, class: 'wizard-btn') do %>
+    <%= t 'finish_installation.resend_email.title' %>
+  <% end %>
+</div>
diff --git a/app/views/finish_installation/index.html.erb b/app/views/finish_installation/index.html.erb
index 4ae9cbba1f0..7428e9a37a4 100644
--- a/app/views/finish_installation/index.html.erb
+++ b/app/views/finish_installation/index.html.erb
@@ -1,16 +1,16 @@
-<h1><%= t 'first_installation.congratulations' %></h1>
+<h1><%= t 'finish_installation.congratulations' %></h1>
 
 <div class='row'>
   <%= image_tag "/images/wizard/tada.svg", class: "tada" %>
 </div>
 
 <div class='row help-text'>
-  <%= t 'first_installation.register.help' %>
+  <%= t 'finish_installation.register.help' %>
 </div>
 
 <div class='row'>
   <%= link_to(finish_installation_register_path, class: 'wizard-btn primary') do %>
     <i class='fa fa-user'></i>
-    <%= t 'first_installation.register.button' %>
+    <%= t 'finish_installation.register.button' %>
   <% end %>
 </div>
diff --git a/app/views/finish_installation/register.html.erb b/app/views/finish_installation/register.html.erb
index 8d952a355d2..b6914657327 100644
--- a/app/views/finish_installation/register.html.erb
+++ b/app/views/finish_installation/register.html.erb
@@ -1,4 +1,4 @@
-<h1><%= t 'first_installation.register.title' %></h1>
+<h1><%= t 'finish_installation.register.title' %></h1>
 
 <%- if @allowed_emails.present? %>
   <%= form_tag(finish_installation_register_path) do %>
@@ -43,11 +43,11 @@
       <% end %>
     </div>
 
-    <%= submit_tag(t('first_installation.register.button'), class: 'wizard-btn primary') %>
+    <%= submit_tag(t('finish_installation.register.button'), class: 'wizard-btn primary') %>
 
   <%- end %>
 <%- else -%>
-  <p><%= raw(t 'first_installation.register.no_emails') %></p>
+  <p><%= raw(t 'finish_installation.register.no_emails') %></p>
 <%- end %>
 
 <script>
diff --git a/app/views/finish_installation/resend_email.html.erb b/app/views/finish_installation/resend_email.html.erb
new file mode 100644
index 00000000000..0989e0c53b2
--- /dev/null
+++ b/app/views/finish_installation/resend_email.html.erb
@@ -0,0 +1,3 @@
+<h1><%= t 'finish_installation.resend_email.title' %></h1>
+
+<%= raw(t 'finish_installation.resend_email.message', email: @email) %>
diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index 01ba7f9cc81..cfcab9a584e 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -3192,7 +3192,7 @@ en:
     staff_tag_remove_disallowed: "The tag \"%{tag}\" may only be removed by staff."
   rss_by_tag: "Topics tagged %{tag}"
 
-  first_installation:
+  finish_installation:
     congratulations: "Congratulations, you installed Discourse!"
     register:
       button: "Register"
@@ -3202,6 +3202,9 @@ en:
     confirm_email:
       title: "Confirm your Email"
       message: "<p>We sent an activation mail to <b>%{email}</b>. Please follow the instructions in the email to activate your account.</p><p>If it doesn't arrive, ensure you have set up email correctly for your Discourse and check your spam folder.</p>"
+    resend_email:
+      title: "Resend Activation Email"
+      message: "<p>We've re-sent the activation email to <b>%{email}</b>"
 
   wizard:
     title: "Discourse Setup"
diff --git a/config/routes.rb b/config/routes.rb
index 5c51163ef59..434c13483af 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -41,6 +41,7 @@ Discourse::Application.routes.draw do
   get "finish-installation/register" => "finish_installation#register"
   post "finish-installation/register" => "finish_installation#register"
   get "finish-installation/confirm-email" => "finish_installation#confirm_email"
+  put "finish-installation/resend-email" => "finish_installation#resend_email"
 
   resources :directory_items
 
diff --git a/spec/controllers/finish_installation_controller_spec.rb b/spec/controllers/finish_installation_controller_spec.rb
index 2ada049fbf2..2e519aedbd1 100644
--- a/spec/controllers/finish_installation_controller_spec.rb
+++ b/spec/controllers/finish_installation_controller_spec.rb
@@ -82,4 +82,18 @@ describe FinishInstallationController do
       end
     end
   end
+
+  describe '.resend_email' do
+    before do
+      SiteSetting.has_login_hint = true
+      GlobalSetting.stubs(:developer_emails).returns("robin@example.com")
+      post :register, email: 'robin@example.com', username: 'eviltrout', password: 'disismypasswordokay'
+    end
+
+    it "resends the email" do
+      Jobs.expects(:enqueue).with(:critical_user_email, has_entries(type: :signup))
+      get :resend_email
+      expect(response).to be_success
+    end
+  end
 end