diff --git a/app/mailers/ci/notify.rb b/app/mailers/ci/notify.rb
index 6dcc118ac05..4462da0d7d2 100644
--- a/app/mailers/ci/notify.rb
+++ b/app/mailers/ci/notify.rb
@@ -10,7 +10,7 @@ module Ci
     default_url_options[:port]     = Gitlab.config.gitlab.port unless Gitlab.config.gitlab_on_standard_port?
     default_url_options[:script_name] = Gitlab.config.gitlab.relative_url_root
 
-    default from: GitlabCi.config.gitlab_ci.email_from
+    default from: Gitlab.config.gitlab.email_from
 
     # Just send email with 3 seconds delay
     def self.delay
diff --git a/app/views/ci/admin/runners/index.html.haml b/app/views/ci/admin/runners/index.html.haml
index f1ab3399dcc..d578ff922ad 100644
--- a/app/views/ci/admin/runners/index.html.haml
+++ b/app/views/ci/admin/runners/index.html.haml
@@ -47,5 +47,6 @@
       %th Last contact
       %th
 
-  = render @runners
+  - @runners.each do |runner|
+    = render "ci/admin/runners/runner", runner: runner
 = paginate @runners
diff --git a/app/views/ci/runners/_runner.html.haml b/app/views/ci/runners/_runner.html.haml
index 7ead5736bb1..ef8622e2807 100644
--- a/app/views/ci/runners/_runner.html.haml
+++ b/app/views/ci/runners/_runner.html.haml
@@ -3,7 +3,7 @@
     = runner_status_icon(runner)
     %span.monospace
       - if @runners.include?(runner)
-        = link_to runner.short_sha, [:ci, @project, runner]
+        = link_to runner.short_sha, ci_project_runner_path(@project, runner)
         %small
           =link_to edit_ci_project_runner_path(@project, runner) do
             %i.fa.fa-edit.btn