diff --git a/source/components/conversation/FormDecorator.js b/source/components/conversation/FormDecorator.js
index 7bcc8973b..29e00eb62 100644
--- a/source/components/conversation/FormDecorator.js
+++ b/source/components/conversation/FormDecorator.js
@@ -85,9 +85,11 @@ export var FormDecorator = formType => RenderField =>
 			/* There won't be any answer zone here, widen the question zone */
 			let wideQuestion = formType == 'rhetorical-question' && !possibleChoice
 
+
 			let { pre = v => v, test, error } = valueType ? valueType.validator : {},
 				validate = test && (v => (v && test(pre(v)) ? undefined : error))
 
+
 			let question = (
 				<h1
 					style={{
diff --git a/source/components/conversation/Input.js b/source/components/conversation/Input.js
index 827bee437..8496ce2a4 100644
--- a/source/components/conversation/Input.js
+++ b/source/components/conversation/Input.js
@@ -14,15 +14,15 @@ export default class Input extends Component {
 		let {
 				input,
 				stepProps: { dottedName, attributes, submit, valueType },
-				meta: { touched, error, active },
+				meta: { dirty, error, active },
 				themeColours
 			} = this.props,
 			answerSuffix = valueType.suffix,
 			suffixed = answerSuffix != null,
-			inputError = touched && error,
+			inputError = dirty && error,
 			{ hoverSuggestion } = this.state,
-			sendButtonDisabled =
-				input.value == null || input.value == '' || inputError
+			submitDisabled =
+				!dirty || inputError
 
 		return (
 			<span>
@@ -43,11 +43,8 @@ export default class Input extends Component {
 						}
 						onKeyDown={
 							({ key }) =>
-								key == 'Enter' &&
-								input.value &&
-								(!error ? submit() : input.onBlur())
-
-							// blur will trigger the error
+								key == 'Enter'
+								&& (submitDisabled ? input.onBlur() : submit())
 						}
 					/>
 					{suffixed && (
@@ -60,7 +57,7 @@ export default class Input extends Component {
 						</label>
 					)}
 					<SendButton
-						{...{ sendButtonDisabled, themeColours, error, submit }}
+						{...{disabled: submitDisabled, themeColours, error, submit }}
 					/>
 				</div>
 
diff --git a/source/components/conversation/SendButton.js b/source/components/conversation/SendButton.js
index cc12d665a..a4e15236d 100644
--- a/source/components/conversation/SendButton.js
+++ b/source/components/conversation/SendButton.js
@@ -4,16 +4,16 @@ import HoverDecorator from 'Components/HoverDecorator'
 @HoverDecorator
 export default class SendButton extends Component {
 	getAction(){
-		let {sendButtonDisabled, error, submit } = this.props
-		return () => (!sendButtonDisabled && !error ? submit() : null)
+		let {disabled, submit } = this.props
+		return () => (!disabled ? submit() : null)
 	}
 	render() {
-		let { sendButtonDisabled, themeColours, hover } = this.props
+		let { disabled, themeColours, hover } = this.props
 		return (
 			<span className="sendWrapper">
 				<button
 					className="send"
-					disabled={sendButtonDisabled}
+					disabled={disabled}
 					style={{
 						color: themeColours.textColour,
 						background: themeColours.colour
@@ -25,7 +25,7 @@ export default class SendButton extends Component {
 				</button>
 				<span
 					className="keyIcon"
-					style={{ opacity: hover && !sendButtonDisabled ? 1 : 0 }}
+					style={{ opacity: hover && !disabled ? 1 : 0 }}
 				>
 					Entrée{' '}↵
 				</span>