diff --git a/src/components/Common/InputField.js b/src/components/Common/InputField.js
index 354fb184a..8913cbd03 100644
--- a/src/components/Common/InputField.js
+++ b/src/components/Common/InputField.js
@@ -29,7 +29,7 @@ export const InputField = props => {
         onPaste={props.onPaste}
       />
       <p className="description">{props.description}</p>
-      { props.pristine ? <p style={errorStyle}/> : <p style={errorStyle}>{error}</p> }
+      { props.pristine ? <p style={errorStyle} className="error"/> : <p style={errorStyle}>{error}</p> }
     </div>
   );
 };
diff --git a/src/components/Common/__snapshots__/AddressInput.spec.js.snap b/src/components/Common/__snapshots__/AddressInput.spec.js.snap
index 1bf90ce32..98cf82e29 100644
--- a/src/components/Common/__snapshots__/AddressInput.spec.js.snap
+++ b/src/components/Common/__snapshots__/AddressInput.spec.js.snap
@@ -26,6 +26,7 @@ exports[`AddressInput Should render the component 1`] = `
     Where the money goes after investors transactions. Immediately after each transaction. We recommend to setup a multisig wallet with hardware based signers.
   </p>
   <p
+    className="error"
     style={
       Object {
         "color": "red",
diff --git a/src/components/Common/__snapshots__/BigNumberInput.spec.js.snap b/src/components/Common/__snapshots__/BigNumberInput.spec.js.snap
index 1360efd4a..c1820c863 100644
--- a/src/components/Common/__snapshots__/BigNumberInput.spec.js.snap
+++ b/src/components/Common/__snapshots__/BigNumberInput.spec.js.snap
@@ -26,6 +26,7 @@ exports[`BigNumberInput Should render the component 1`] = `
     Exchange rate Ethereum to Tokens. If it's 100, then for 1 Ether you can buy 100 tokens
   </p>
   <p
+    className="error"
     style={
       Object {
         "color": "red",
diff --git a/src/components/Common/__snapshots__/NumericInput.spec.js.snap b/src/components/Common/__snapshots__/NumericInput.spec.js.snap
index 3c4db79ef..4dc9e8c79 100644
--- a/src/components/Common/__snapshots__/NumericInput.spec.js.snap
+++ b/src/components/Common/__snapshots__/NumericInput.spec.js.snap
@@ -26,6 +26,7 @@ exports[`NumericInput Should render the component 1`] = `
     Refers to how divisible a token can be, from 0 (not at all divisible) to 18 (pretty much continuous).
   </p>
   <p
+    className="error"
     style={
       Object {
         "color": "red",
diff --git a/src/components/Common/__snapshots__/ReservedTokensInputBlock.spec.js.snap b/src/components/Common/__snapshots__/ReservedTokensInputBlock.spec.js.snap
index fdffb367b..926d71107 100644
--- a/src/components/Common/__snapshots__/ReservedTokensInputBlock.spec.js.snap
+++ b/src/components/Common/__snapshots__/ReservedTokensInputBlock.spec.js.snap
@@ -35,6 +35,7 @@ exports[`percentage 1`] = `
           Address where to send reserved tokens.
         </p>
         <p
+          className="error"
           style={
             Object {
               "color": "red",
@@ -119,6 +120,7 @@ exports[`percentage 1`] = `
           Value in tokens. Don't forget to click + button for each reserved token.
         </p>
         <p
+          className="error"
           style={
             Object {
               "color": "red",
@@ -332,6 +334,7 @@ exports[`tokens 1`] = `
           Address where to send reserved tokens.
         </p>
         <p
+          className="error"
           style={
             Object {
               "color": "red",
@@ -416,6 +419,7 @@ exports[`tokens 1`] = `
           Value in tokens. Don't forget to click + button for each reserved token.
         </p>
         <p
+          className="error"
           style={
             Object {
               "color": "red",
diff --git a/src/components/manage/DistributeTokensStep.js b/src/components/manage/DistributeTokensStep.js
index d18e8808c..60361b9f7 100644
--- a/src/components/manage/DistributeTokensStep.js
+++ b/src/components/manage/DistributeTokensStep.js
@@ -21,7 +21,7 @@ export const DistributeTokensStep = ({ disabled, handleClick }) => (
             'button_fill': !disabled
           }
         )}>
-          Distribute tokens
+          Distribute reserved tokens
         </span>
       </Link>
     </div>
diff --git a/src/components/manage/__snapshots__/DistributeTokensStep.spec.js.snap b/src/components/manage/__snapshots__/DistributeTokensStep.spec.js.snap
index 1fd9494c3..58327cbde 100644
--- a/src/components/manage/__snapshots__/DistributeTokensStep.spec.js.snap
+++ b/src/components/manage/__snapshots__/DistributeTokensStep.spec.js.snap
@@ -29,7 +29,7 @@ exports[`DistributeTokensStep should render the component with active button 1`]
       <span
         className="button button_fill"
       >
-        Distribute tokens
+        Distribute reserved tokens
       </span>
     </a>
   </div>
@@ -65,7 +65,7 @@ exports[`DistributeTokensStep should render the component with disabled button 1
       <span
         className="button button_disabled"
       >
-        Distribute tokens
+        Distribute reserved tokens
       </span>
     </a>
   </div>
diff --git a/src/components/stepThree/StepThreeForm.js b/src/components/stepThree/StepThreeForm.js
index a9927a1b3..81ce531b5 100644
--- a/src/components/stepThree/StepThreeForm.js
+++ b/src/components/stepThree/StepThreeForm.js
@@ -104,8 +104,7 @@ export const StepThreeForm = ({ handleSubmit, values, invalid, pristine, mutator
               component={InputField2}
               validate={composeValidators(
                 isNonNegative(),
-                isDecimalPlacesNotGreaterThan()(props.decimals),
-                isLessOrEqualThan('Should be less or equal than the supply of some tier')(props.tierStore.maxSupply)
+                isDecimalPlacesNotGreaterThan()(props.decimals)
               )}
               disabled={values.whitelistEnabled === 'yes'}
               errorStyle={inputErrorStyle}
diff --git a/src/components/stepThree/__snapshots__/CrowdsaleBlock.spec.js.snap b/src/components/stepThree/__snapshots__/CrowdsaleBlock.spec.js.snap
index ab482b38c..5baca4761 100644
--- a/src/components/stepThree/__snapshots__/CrowdsaleBlock.spec.js.snap
+++ b/src/components/stepThree/__snapshots__/CrowdsaleBlock.spec.js.snap
@@ -330,6 +330,7 @@ exports[`CrowdsaleBlock Should render the component for the first Tier 1`] = `
                     Exchange rate Ethereum to Tokens. If it's 100, then for 1 Ether you can buy 100 tokens
                   </p>
                   <p
+                    className="error"
                     style={
                       Object {
                         "color": "red",
@@ -797,6 +798,7 @@ exports[`CrowdsaleBlock Should render the component for the second Tier 1`] = `
                     Exchange rate Ethereum to Tokens. If it's 100, then for 1 Ether you can buy 100 tokens
                   </p>
                   <p
+                    className="error"
                     style={
                       Object {
                         "color": "red",
@@ -1338,6 +1340,7 @@ exports[`CrowdsaleBlock Should render the component for the second Tier with whi
                     Exchange rate Ethereum to Tokens. If it's 100, then for 1 Ether you can buy 100 tokens
                   </p>
                   <p
+                    className="error"
                     style={
                       Object {
                         "color": "red",
@@ -1553,6 +1556,7 @@ exports[`CrowdsaleBlock Should render the component for the second Tier with whi
                           Address of a whitelisted account. Whitelists are inherited. E.g., if an account whitelisted on Tier 1 and didn't buy max cap on Tier 1, he can buy on Tier 2, and following tiers.
                         </p>
                         <p
+                          className="error"
                           style={
                             Object {
                               "color": "red",
@@ -1596,6 +1600,7 @@ exports[`CrowdsaleBlock Should render the component for the second Tier with whi
                           Minimum amount tokens to buy. Not a minimal size of a transaction. If minCap is 1 and user bought 1 token in a previous transaction and buying 0.1 token it will allow him to buy.
                         </p>
                         <p
+                          className="error"
                           style={
                             Object {
                               "color": "red",
@@ -1639,6 +1644,7 @@ exports[`CrowdsaleBlock Should render the component for the second Tier with whi
                           Maximum is the hard limit.
                         </p>
                         <p
+                          className="error"
                           style={
                             Object {
                               "color": "red",
diff --git a/src/components/stepThree/index.js b/src/components/stepThree/index.js
index a845fa91a..50d136b6c 100644
--- a/src/components/stepThree/index.js
+++ b/src/components/stepThree/index.js
@@ -9,6 +9,7 @@ import { inject, observer } from "mobx-react";
 import { Loader } from '../Common/Loader'
 import { noGasPriceAvailable, warningOnMainnetAlert } from '../../utils/alerts'
 import { StepThreeForm } from './StepThreeForm'
+import { isLessOrEqualThan } from '../../utils/validations'
 
 const { CROWDSALE_SETUP } = NAVIGATION_STEPS;
 
@@ -113,6 +114,17 @@ export class stepThree extends React.Component {
           decimals={tokenStore.decimals}
           tierStore={tierStore}
           generalStore={generalStore}
+          validate={(values) => {
+            const errors = {}
+            const maxSupply = tierStore.maxSupply
+            const minCap = maxSupply !== 0
+              ? isLessOrEqualThan('Should be less or equal than the supply of some tier')(maxSupply)(values.minCap)
+              : undefined
+
+            if (minCap) errors.minCap = minCap
+
+            return errors
+          }}
         />
         <Loader show={this.state.loading}/>
       </section>
diff --git a/submodules/token-wizard-test-automation b/submodules/token-wizard-test-automation
index e175660b9..1d2a0913c 160000
--- a/submodules/token-wizard-test-automation
+++ b/submodules/token-wizard-test-automation
@@ -1 +1 @@
-Subproject commit e175660b9bfeb6c98c0e3392f4936d1650007fa5
+Subproject commit 1d2a0913c1172b98fb669cf6e8986a8aff5fc9b2