diff --git a/app/assets/javascripts/controllers/home.js b/app/assets/javascripts/controllers/home.js
index 26f64e0bc..6c8f82c69 100644
--- a/app/assets/javascripts/controllers/home.js
+++ b/app/assets/javascripts/controllers/home.js
@@ -16,6 +16,16 @@ Application.Controllers.controller('HomeController', ['$scope', '$stateParams',
       events: false
     };
 
+    /**
+     * Setup the feature-tour for the home page. (admins only)
+     * This is intended as a contextual help (when pressing F1)
+     */
+    $scope.setupHomeTour = function () {
+      if ($scope.currentUser && $scope.currentUser.role === 'admin') {
+        setupWelcomeTour();
+      }
+    };
+
     /* PRIVATE SCOPE */
 
     /**
@@ -31,18 +41,18 @@ Application.Controllers.controller('HomeController', ['$scope', '$stateParams',
       // We set the home page content, with the directives replacing the placeholders
       $scope.homeContent = insertDirectives(settingsPromise.home_content);
 
-      // setup the tour for admins
-      if ($scope.currentUser && $scope.currentUser.role === 'admin') {
-        setupWelcomeTour();
-        // listen the $destroy event of the controller to remove the F1 key binding
-        $scope.$on('$destroy', function () {
-          window.removeEventListener('keydown', handleF1);
-        });
-      }
+      // listen the $destroy event of the controller to remove the F1 key binding
+      $scope.$on('$destroy', function () {
+        window.removeEventListener('keydown', handleF1);
+      });
 
+      // for admins, setup the tour on login
       $scope.$watch('currentUser', function (newValue, oldValue) {
         if (!oldValue && newValue && newValue.role === 'admin') {
-          setupWelcomeTour();
+          const uitour = uiTourService.getTourByName('welcome');
+          if (!uitour.hasStep()) {
+            setupWelcomeTour();
+          }
         }
       });
     };
diff --git a/app/assets/templates/home.html.erb b/app/assets/templates/home.html.erb
index c8d0481ee..6e758acf7 100644
--- a/app/assets/templates/home.html.erb
+++ b/app/assets/templates/home.html.erb
@@ -1,2 +1,9 @@
-<div class="home-page" compile="homeContent">
+<div ui-tour="welcome"
+     ui-tour-backdrop="true"
+     ui-tour-template-url="'<%= asset_path "shared/tour-step-template.html" %>'"
+     ui-tour-use-hotkeys="true"
+     ui-tour-scroll-parent-id="content-main"
+     post-render="setupHomeTour">
+  <div class="home-page" compile="homeContent">
+  </div>
 </div>
diff --git a/app/views/application/index.html.erb b/app/views/application/index.html.erb
index 6446364d4..fa8a082f9 100644
--- a/app/views/application/index.html.erb
+++ b/app/views/application/index.html.erb
@@ -95,12 +95,7 @@
 
 <body ng-controller="ApplicationController"
       ng-init="setCurrentUser(<%= current_user ? current_user.to_json : 'null' %>)"
-      ng-cloak
-      ui-tour="welcome"
-      ui-tour-backdrop="true"
-      ui-tour-template-url="'<%= asset_path "shared/tour-step-template.html" %>'"
-      ui-tour-use-hotkeys="true"
-      ui-tour-scroll-parent-id="content-main">
+      ng-cloak>
   <div growl></div>
 
   <%= flash_messages %>
