diff --git a/index.html b/index.html
index a20131971..b00b8fbc6 100644
--- a/index.html
+++ b/index.html
@@ -222,7 +222,7 @@
 				style="margin: 100px auto; max-width: 800px; text-align: center; font-family: 'Montserrat', sans-serif; font-weight: 300;"
 			>
 				<img
-					src="https://www.numerique.gouv.fr/assets/img/logos/Logo_de_la_Republique_francaise.png"
+					src="images/marianne.svg"
 					alt="Un service de l'État français"
 					style="width: 200px; margin-bottom: 2rem;"
 				/>
diff --git a/source/components/CurrencyInput/CurrencyInput.js b/source/components/CurrencyInput/CurrencyInput.js
index 0be897326..907db76a6 100644
--- a/source/components/CurrencyInput/CurrencyInput.js
+++ b/source/components/CurrencyInput/CurrencyInput.js
@@ -82,6 +82,7 @@ export default function CurrencyInput({
 				}}
 				onChange={handleChange}
 				value={currentValue.toString().replace('.', decimalSeparator)}
+				autoComplete="off"
 			/>
 			{!isCurrencyPrefixed && <>&nbsp;€</>}
 		</div>
diff --git a/source/components/conversation/Input.js b/source/components/conversation/Input.js
index 9b96c7d79..b810ef6ae 100644
--- a/source/components/conversation/Input.js
+++ b/source/components/conversation/Input.js
@@ -60,6 +60,7 @@ export default compose(
 						debouncedSetFormValue(unit === '%' ? floatValue / 100 : floatValue)
 					}}
 					value={unit === '%' ? 100 * value : value}
+					autoComplete="off"
 				/>
 				{suffixed && (
 					<label className="suffix" htmlFor={'step-' + dottedName}>
diff --git a/source/reducers/rootReducer.js b/source/reducers/rootReducer.js
index c6ec826f1..44d1e656a 100644
--- a/source/reducers/rootReducer.js
+++ b/source/reducers/rootReducer.js
@@ -179,9 +179,8 @@ function simulation(state = null, action, rules) {
 }
 
 const addAnswerToSituation = (dottedName, value, state) => {
-	const dottedPath = dottedName.split(' . ')
 	return compose(
-		set(lensPath(['form', 'conversation', 'values', ...dottedPath]), value),
+		set(lensPath(['simulation', 'situation', dottedName]), value),
 		over(lensPath(['conversationSteps', 'foldedSteps']), (steps = []) =>
 			uniq([...steps, dottedName])
 		)
diff --git a/source/sites/mon-entreprise.fr/pages/Iframes/IframeFooter.js b/source/sites/mon-entreprise.fr/pages/Iframes/IframeFooter.js
index 4d7b63bfd..72ea5c59e 100644
--- a/source/sites/mon-entreprise.fr/pages/Iframes/IframeFooter.js
+++ b/source/sites/mon-entreprise.fr/pages/Iframes/IframeFooter.js
@@ -1,5 +1,5 @@
 import LangSwitcher from 'Components/LangSwitcher'
-// import marianneSvg from 'Images/marianne.svg'
+import marianneSvg from 'Images/marianne.svg'
 import urssafSvg from 'Images/urssaf.svg'
 import React, { useEffect, useState } from 'react'
 import emoji from 'react-easy-emoji'
@@ -32,9 +32,7 @@ export default function IframeFooter() {
 				<a href="https://beta.gouv.fr" target="_blank">
 					<img
 						style={{ height: '2.5rem' }}
-						src={
-							'https://www.numerique.gouv.fr/assets/img/logos/Logo_de_la_Republique_francaise.png'
-						}
+						src={marianneSvg}
 						alt="un service de l’Etat français incubé par beta.gouv.fr"
 					/>
 				</a>
diff --git a/source/sites/mon-entreprise.fr/pages/Landing/Landing.js b/source/sites/mon-entreprise.fr/pages/Landing/Landing.js
index 5208f31c3..d39b80f03 100644
--- a/source/sites/mon-entreprise.fr/pages/Landing/Landing.js
+++ b/source/sites/mon-entreprise.fr/pages/Landing/Landing.js
@@ -4,7 +4,7 @@ import { T } from 'Components'
 import withSitePaths from 'Components/utils/withSitePaths'
 import logoEnSvg from 'Images/logo-mycompany.svg'
 import logoSvg from 'Images/logo.svg'
-// import marianneSvg from 'Images/marianne.svg'
+import marianneSvg from 'Images/marianne.svg'
 import urssafSvg from 'Images/urssaf.svg'
 import React from 'react'
 import emoji from 'react-easy-emoji'
@@ -37,12 +37,7 @@ export default withSitePaths(({ sitePaths }: Props) => {
 					href="https://beta.gouv.fr"
 					target="_blank"
 					className="landing-header__institutional-logo">
-					<img
-						alt="logo marianne"
-						src={
-							'https://www.numerique.gouv.fr/assets/img/logos/Logo_de_la_Republique_francaise.png'
-						}
-					/>
+					<img alt="logo marianne" src={marianneSvg} />
 				</a>
 				<a
 					href="https://www.urssaf.fr"