diff --git a/README.md b/README.md
index b974d50f..127483dc 100644
--- a/README.md
+++ b/README.md
@@ -50,9 +50,11 @@ Ubuntu18 ```npm run distUbuntu18```
 The built installers can then be found in the `dist` folder.
 ## Custom protocol support (Only Linux)
 
-To be able to take advantage of zbay protocol on linux (Other platforms work by default) you need to create Desktop Entry.
-You can find template file in repository ```zbay.desktop```. You need to change ```Exec=/path/to/zbay/Zbay-version.AppImage``` inside ```zbay.desktop``` to match your path to Zbay AppImage file. 
-Then place file inside ```~/.local/share/applications/``` folder and run command to register new entry ```xdg-mime default zbay.desktop x-scheme-handler/zbay```
+To be able to open Zbay links on Linux you will, for the time being, need to create a "Desktop Entry".
+
+1. Find the ```zbay.desktop``` template file in the repository.
+2. Open ```zbay.desktop``` and change ```Exec=/path/to/zbay/Zbay-version.AppImage``` inside to match the path to your Zbay AppImage file. 
+3. Place the file inside the ```~/.local/share/applications/``` folder and run the following command to register the new entry: ```xdg-mime default zbay.desktop x-scheme-handler/zbay```
 
 ## Managing keys
 
diff --git a/src/renderer/components/ui/PublishChannelModal.js b/src/renderer/components/ui/PublishChannelModal.js
index f15b4671..fbd09f52 100644
--- a/src/renderer/components/ui/PublishChannelModal.js
+++ b/src/renderer/components/ui/PublishChannelModal.js
@@ -117,7 +117,9 @@ export const formSchema = publicChannels =>
           'testFormat',
           'Channel name can contain only small characters and up to one hyphen.',
           function (value) {
-            return parseChannelName(value).match(/^[a-z0-9]+([\s-][a-z0-9]+){0,}$/)
+            return parseChannelName(value).match(
+              /^[a-z0-9]+([\s-][a-z0-9]+){0,}$/
+            )
           }
         )
         .validateName(publicChannels)
@@ -235,7 +237,7 @@ export const PublishChannelModal = ({
                       />
                     </Grid>
                     <div className={classes.gutter}>
-                      {showParsedMessage(values.name) && (
+                      {showParsedMessage(values.name) && isValid && (
                         <Grid container alignItems='center' direction='row'>
                           <Grid item className={classes.iconDiv}>
                             <WarningIcon className={classes.warrningIcon} />
diff --git a/src/renderer/components/widgets/channels/CreateChannelForm.js b/src/renderer/components/widgets/channels/CreateChannelForm.js
index f80907e8..c20bc3b3 100644
--- a/src/renderer/components/widgets/channels/CreateChannelForm.js
+++ b/src/renderer/components/widgets/channels/CreateChannelForm.js
@@ -48,7 +48,10 @@ const styles = theme => ({
   }
 })
 export const parseChannelName = (name = '') => {
-  return name.toLowerCase().replace(/ +/g, '-').replace(/-+/g, '-')
+  return name
+    .toLowerCase()
+    .replace(/ +/g, '-')
+    .replace(/-+/g, '-')
 }
 export const formSchema = Yup.object().shape({
   name: Yup.string()
@@ -100,7 +103,7 @@ export const CreateChannelForm = ({ classes, onSubmit, setStep }) => (
               placeholder='my-channel'
             />
             <div className={classes.gutter}>
-              {showParsedMessage(values.name) && (
+              {showParsedMessage(values.name) && isValid && (
                 <Grid container alignItems='center' direction='row'>
                   <Grid item className={classes.iconDiv}>
                     <WarningIcon className={classes.warrningIcon} />