diff --git a/app/views/users/sessions/new.html.haml b/app/views/users/sessions/new.html.haml
index 9f7a9962f..e92e681e2 100644
--- a/app/views/users/sessions/new.html.haml
+++ b/app/views/users/sessions/new.html.haml
@@ -1,12 +1,6 @@
 = content_for(:page_id, 'auth')
 
 .auth-form.sign-in-form
-  %p.register
-    %span
-      Nouveau sur demarches‑simplifiees.fr ?
-    = link_to "Créer un compte", new_user_registration_path, class: "button primary auth-signup-button"
-
-  %hr
 
   = form_for User.new, url: user_session_path, html: { class: "form" } do |f|
     %h1 Connectez-vous
@@ -28,3 +22,10 @@
     = f.submit "Se connecter", class: "button large primary expand"
 
   = render partial: 'shared/france_connect_login', locals: { url: france_connect_particulier_path }
+
+  %hr
+  %p.center
+    %span Vous êtes nouveau sur demarches‑simplifiees.fr ?
+    %br
+    %br
+    = link_to "Trouvez votre démarche", "https://faq.demarches-simplifiees.fr/article/59-comment-trouver-ma-demarche", target: "_blank", class: "button expend secondary"
diff --git a/spec/features/users/sign_up_spec.rb b/spec/features/users/sign_up_spec.rb
index 1436433a4..72da33bcd 100644
--- a/spec/features/users/sign_up_spec.rb
+++ b/spec/features/users/sign_up_spec.rb
@@ -3,24 +3,23 @@ require 'spec_helper'
 feature 'Signing up:' do
   let(:user_email) { generate :user_email }
   let(:user_password) { 'démarches-simplifiées-pwd' }
+  let(:procedure) { create :simple_procedure, :with_service }
 
   scenario 'a new user can sign-up' do
-    visit root_path
-    click_on 'Connexion'
-    click_on 'Créer un compte'
+    visit commencer_path(path: procedure.path)
+    click_on 'Créer un compte demarches-simplifiees.fr'
 
     sign_up_with user_email, user_password
     expect(page).to have_content "nous avons besoin de vérifier votre adresse #{user_email}"
 
     click_confirmation_link_for user_email
     expect(page).to have_content 'Votre compte a été activé'
-    expect(page).to have_current_path dossiers_path
+    expect(page).to have_current_path commencer_path(path: procedure.path)
   end
 
-  scenario 'a new user can’t sign-up with too short password' do
-    visit root_path
-    click_on 'Connexion'
-    click_on 'Créer un compte'
+  scenario 'a new user can’t sign-up with too short password when visiting a procedure' do
+    visit commencer_path(path: procedure.path)
+    click_on 'Créer un compte demarches-simplifiees.fr'
 
     expect(page).to have_current_path new_user_registration_path
     sign_up_with user_email, '1234567'
@@ -61,9 +60,8 @@ feature 'Signing up:' do
 
   context 'when a user is not confirmed yet' do
     before do
-      visit root_path
-      click_on 'Connexion'
-      click_on 'Créer un compte'
+      visit commencer_path(path: procedure.path)
+      click_on 'Créer un compte demarches-simplifiees.fr'
 
       sign_up_with user_email, user_password
     end