diff --git a/app/views/layouts/_navbar.html.haml b/app/views/layouts/_navbar.html.haml
index 5d99553f4..47dd43354 100644
--- a/app/views/layouts/_navbar.html.haml
+++ b/app/views/layouts/_navbar.html.haml
@@ -31,7 +31,8 @@
     = render partial: 'administrateurs/login_banner'
   -else
     = link_to "Utilisateur", '/users/sign_in', method: :get, :class => 'btn btn-md'
-    = link_to "Accompagnateur", '/gestionnaires/sign_in', method: :get, :class => 'btn btn-md'
+    -unless Features.unified_login
+      = link_to "Accompagnateur", '/gestionnaires/sign_in', method: :get, :class => 'btn btn-md'
     = link_to "Administrateur", '/administrateurs/sign_in', method: :get, :class => 'btn btn-md'
 
 - if Rails.env != 'production'
diff --git a/spec/controllers/root_controller_spec.rb b/spec/controllers/root_controller_spec.rb
index 9dae45c6b..a96f202cf 100644
--- a/spec/controllers/root_controller_spec.rb
+++ b/spec/controllers/root_controller_spec.rb
@@ -40,4 +40,18 @@ describe RootController, type: :controller do
 
     it { expect(response.body).to have_css('#landing') }
   end
-end
\ No newline at end of file
+
+  context "unified login" do
+    render_views
+
+    before do
+      allow(Features).to receive(:unified_login).and_return(true)
+      subject
+    end
+
+    it "won't have gestionnaire login link" do
+      expect(response.body).to have_css("a[href='#{new_user_session_path}']")
+      expect(response.body).to_not have_css("a[href='#{new_gestionnaire_session_path}']")
+    end
+  end
+end