diff --git a/client/src/views/Repos.vue b/client/src/views/Repos.vue
index ddaaa5a..4a86c75 100644
--- a/client/src/views/Repos.vue
+++ b/client/src/views/Repos.vue
@@ -44,8 +44,8 @@
             </div>
             <transition name="add-column" appear>
               <div class="column" v-if="repositoryItem!==undefined && !showDelete">
-                <BulmaInput icon="heading" v-model="repository.name" label="Name" placeholder="my_repo_name" :readonly="repositoryItem!==-1" :required="true" :hasError="v$.repository.name.$invalid" :errors="[]" help="Alphanumeric with dash and hyphen" />
-                <BulmaInput icon="user" v-model="repository.user" label="Username" placeholder="my-user" :hasError="v$.repository.user.$invalid" :errors="[]" help="Alphnumeric with hyphen" />
+                <BulmaInput icon="heading" v-model="repository.name" label="Name" placeholder="my_repo_name" :readonly="repositoryItem!==-1" :required="true" :hasError="v$.repository.name.$invalid" :errors="[]" help="Alphanumeric with underscore and hyphen" />
+                <BulmaInput icon="user" v-model="repository.user" label="Username" placeholder="my-user" :hasError="v$.repository.user.$invalid" :errors="[]" help="Alphanumeric with hyphen" />
                 <BulmaInput icon="lock" v-model="repository.password" type="password" label="Password" placeholder="Password or Token" />
                 <BulmaInput :icon="['fab','git']" v-model="repository.uri" label="Uri" placeholder="https://github.com/account/repo.git" :required="true" :hasError="v$.repository.uri.$invalid" :errors="[]" help="Only ssh or https uri's are allowed" />
                 <BulmaInput icon="stopwatch" v-model="repository.cron" label="Cron Schedule" placeholder="*/5 * L * 1,3L" :hasError="v$.repository.cron.$invalid" :errors="[]" help="Minute Hour DayOfMonth Month DayOfWeek" />
@@ -263,7 +263,7 @@
           required,
           regex : helpers.withParams(
               {description: "User must be a valid repository name",type:"regex"},
-              (value) => !helpers.req(value) || (new RegExp("^[a-z0-9_-]{1,50}$").test(value)) // eslint-disable-line
+              (value) => !helpers.req(value) || (new RegExp("^[a-zA-Z0-9_-]{1,50}$").test(value)) // eslint-disable-line
           )             
         },
         uri: {
@@ -278,7 +278,7 @@
         },
         cron: {
           regex : helpers.withParams(
-              {description: "User must be a valid github user (alphanumeric / hyphens)",type:"regex"},
+              {description: "Cron must be valid format",type:"regex"},
               (value) => !helpers.req(value) || (new RegExp("^[0-9-,*/]+ [0-9-,*/]+ [0-9-,*/L]+ [0-9-,*/]+ [0-9-,*/L]+$").test(value)) // eslint-disable-line
           )                    
         },
@@ -286,7 +286,7 @@
           maxLength:39,
           regex : helpers.withParams(
               {description: "User must be a valid github user (alphanumeric / hyphens)",type:"regex"},
-              (value) => !helpers.req(value) || (new RegExp("^[a-z\d](?:[a-z\d]|-(?=[a-z\d])){0,38}$").test(value)) // eslint-disable-line
+              (value) => !helpers.req(value) || (new RegExp("^[a-zA-Z0-9-](?:[a-zA-Z0-9-]|-(?=[a-zA-Z0-9-])){0,38}$").test(value)) // eslint-disable-line
           )          
         }
       }