diff --git a/source/components/LegalNotice.js b/source/components/LegalNotice.js
index d84ae003b..ec99b80c1 100644
--- a/source/components/LegalNotice.js
+++ b/source/components/LegalNotice.js
@@ -44,7 +44,9 @@ export const LegalNoticeContent = withTranslation()(() => (
 				<br />
 				San Francisco, CA 94107 <br />
 				Site web :&nbsp;
-				<a href="https://www.netlify.com">https://www.netlify.com</a>
+				<a href="https://www.netlify.com" target="_blank">
+					https://www.netlify.com
+				</a>
 			</Trans>
 		</p>
 		<h2>
@@ -52,7 +54,7 @@ export const LegalNoticeContent = withTranslation()(() => (
 		</h2>
 		<p>
 			<Trans i18nKey="legalNotice.contact.content">
-				<a href="mailto:contact@mon-entreprise.beta.gouv.fr">
+				<a target="_blank" href="mailto:contact@mon-entreprise.beta.gouv.fr">
 					contact@mon-entreprise.beta.gouv.fr
 				</a>
 			</Trans>
diff --git a/source/components/Overlay.js b/source/components/Overlay.js
index 2ec061ab3..a74782150 100644
--- a/source/components/Overlay.js
+++ b/source/components/Overlay.js
@@ -7,21 +7,14 @@ export default class Overlay extends Component {
 	render() {
 		const { onClose, children, ...otherProps } = this.props
 		return (
-			<div id="overlayWrapper" onClick={onClose}>
+			<div id="overlayWrapper">
 				<animate.fromBottom>
 					<FocusTrap
 						focusTrapOptions={{
 							onDeactivate: onClose,
 							clickOutsideDeactivates: true
 						}}>
-						<div
-							aria-modal="true"
-							id="overlayContent"
-							{...otherProps}
-							onClick={e => {
-								e.preventDefault()
-								e.stopPropagation()
-							}}>
+						<div aria-modal="true" id="overlayContent" {...otherProps}>
 							{children}
 							<LinkButton
 								aria-label="close"
diff --git a/source/components/TargetSelection.js b/source/components/TargetSelection.js
index fb34f2960..384f21b9e 100644
--- a/source/components/TargetSelection.js
+++ b/source/components/TargetSelection.js
@@ -28,7 +28,7 @@ export default compose(
 	withColours,
 	reduxForm({
 		form: 'conversation',
-		destroyOnUnmount: true
+		destroyOnUnmount: false
 	}),
 	connect(
 		state => ({
diff --git a/source/components/rule/Rule.js b/source/components/rule/Rule.js
index e31d6c248..1aad01428 100644
--- a/source/components/rule/Rule.js
+++ b/source/components/rule/Rule.js
@@ -129,12 +129,17 @@ export default compose(
 									{!valuesToShow && (
 										<div style={{ textAlign: 'center', marginTop: '1em' }}>
 											<Link
-												className="ui__ plain button"
+												className="ui__ cta plain button"
 												target="_parent"
 												to={
-													sitePaths.sécuritéSociale
-														? sitePaths.sécuritéSociale.index
-														: sitePaths.index
+													dottedName.includes('contrat salarié')
+														? sitePaths.sécuritéSociale.salarié
+														: dottedName.includes('auto entrepreneur')
+														? sitePaths.sécuritéSociale['auto-entrepreneur']
+														: dottedName.includes('indépendant')
+														? sitePaths.sécuritéSociale.indépendant
+														: // otherwise
+														  sitePaths.sécuritéSociale.index
 												}>
 												<T>Faire une simulation</T>
 											</Link>