diff --git a/src/i18n/locales/en.json b/src/i18n/locales/en.json
index 9f2a17278..4f5ba62d2 100644
--- a/src/i18n/locales/en.json
+++ b/src/i18n/locales/en.json
@@ -714,6 +714,7 @@
     "create_repository": "Create Repository",
     "repository_type": "Repository Type",
     "internal": "Internal",
+    "repository_authentication": "Authentication required",
     "delete_repository": "Delete Repository",
     "repository_created": "Repository created",
     "repository_deleted": "Repository deleted",
diff --git a/src/views/administration/repositories/Repositories.vue b/src/views/administration/repositories/Repositories.vue
index 752b1c282..94e8dc030 100644
--- a/src/views/administration/repositories/Repositories.vue
+++ b/src/views/administration/repositories/Repositories.vue
@@ -89,6 +89,15 @@ import RepositoryCreateRepositoryModal from "./RepositoryCreateRepositoryModal";
               return value === true ? '<i class="fa fa-check-square-o" />' : "";
             },
           },
+          {
+                      title: this.$t('admin.repository_authentication'),
+                      field: "authenticationRequired",
+                      class: "tight",
+                      sortable: true,
+                      formatter(value, row, index) {
+                        return value === true ? '<i class="fa fa-check-square-o" />' : "";
+                      },
+                    },
           {
             title: this.$t('admin.enabled'),
             field: "enabled",
@@ -134,13 +143,17 @@ import RepositoryCreateRepositoryModal from "./RepositoryCreateRepositoryModal";
                     <div>
                       <c-switch color="primary" v-model="internal" label v-bind="labelIcon" />{{$t('admin.internal')}}
                     </div>
+                    <div>
+                     <c-switch color="primary" v-model="authenticationRequired" label v-bind="labelIcon" />{{$t('admin.repository_authentication')}}
+                    </div>
 
                     <div>
                       <b-validated-input-group-form-input
                         id="username" :label="$t('admin.username')"
                         input-group-size="mb-3"
                         v-model="username"
-                        v-show="internal"
+                        rules="required"
+                        v-show="authenticationRequired"
                         v-debounce:750ms="updateRepository" :debounce-events="'keyup'"/>
                     </div>
 
@@ -148,8 +161,10 @@ import RepositoryCreateRepositoryModal from "./RepositoryCreateRepositoryModal";
                       <b-validated-input-group-form-input
                         id="password" :label="$t('admin.password')"
                         input-group-size="mb-3"
+                        type="password"
                         v-model="password"
-                        v-show="internal"
+                        rules="required"
+                        v-show="authenticationRequired"
                         v-debounce:750ms="updateRepository" :debounce-events="'keyup'"/>
                     </div>
 
@@ -173,8 +188,9 @@ import RepositoryCreateRepositoryModal from "./RepositoryCreateRepositoryModal";
                   identifier: row.identifier,
                   url: row.url,
                   internal: row.internal,
+                  authenticationRequired: row.authenticationRequired,
                   username: row.username,
-                  password: row.password || null,
+                  password: row.password || "HiddenDecryptedPropertyPlaceholder",
                   enabled: row.enabled,
                   uuid: row.uuid,
                   labelIcon: {
@@ -189,7 +205,12 @@ import RepositoryCreateRepositoryModal from "./RepositoryCreateRepositoryModal";
                 },
                 enabled() {
                   this.updateRepository();
+                },
+                authenticationRequired(){
+
+                this.updateRepository();
                 }
+
               },
               methods: {
                 deleteRepository: function() {
@@ -207,8 +228,9 @@ import RepositoryCreateRepositoryModal from "./RepositoryCreateRepositoryModal";
                     identifier: this.identifier,
                     url: this.url,
                     internal: this.internal,
+                    authenticationRequired: this.authenticationRequired,
                     username: this.username,
-                    password: this.password || null,
+                    password: this.password || "HiddenDecryptedPropertyPlaceholder",
                     enabled: this.enabled,
                     uuid: this.uuid
                   }).then((response) => {
diff --git a/src/views/administration/repositories/RepositoryCreateRepositoryModal.vue b/src/views/administration/repositories/RepositoryCreateRepositoryModal.vue
index 05cf65110..e202f26be 100644
--- a/src/views/administration/repositories/RepositoryCreateRepositoryModal.vue
+++ b/src/views/administration/repositories/RepositoryCreateRepositoryModal.vue
@@ -18,24 +18,30 @@
     <b-input-group-form-select id="input-repository-type" required="true"
                                v-model="repositoryType" :options="repositoryTypes"
                                :label="$t('admin.repository_type')" />
+
+    <div>
+          <c-switch color="primary" v-model="internal" label v-bind="labelIcon" />{{$t('admin.internal')}}
+        </div>
     <div>
-      <c-switch color="primary" v-model="internal" label v-bind="labelIcon" />{{$t('admin.internal')}}
+      <c-switch color="primary" v-model="repository_authentication" label v-bind="labelIcon" />{{$t('admin.repository_authentication')}}
     </div>
-
-    <b-validated-input-group-form-input
+  <b-validated-input-group-form-input
           id="username"
           :label="$t('admin.username')"
           input-group-size="mb-3"
           v-model="username"
-          v-show="internal"
+          rules="required"
+          v-show="repository_authentication"
       />
 
       <b-validated-input-group-form-input
           id="password"
           :label="$t('admin.password')"
           input-group-size="mb-3"
+          type="password"
+          rules="required"
           v-model="password"
-          v-show="internal"
+          v-show="repository_authentication"
       />
 
     <div>
@@ -74,6 +80,7 @@ import BValidatedInputGroupFormInput from "../../../forms/BValidatedInputGroupFo
         repositoryType: null,
         initialRepositoryType: null,
         internal: false,
+        repository_authentication: false,
         username: null,
         password: null,
         enabled: true,
@@ -103,6 +110,7 @@ import BValidatedInputGroupFormInput from "../../../forms/BValidatedInputGroupFo
           identifier: this.identifier,
           url: this.url,
           internal: this.internal,
+          authenticationRequired: this.repository_authentication,
           username: this.username,
           password: this.password || null,
           enabled: this.enabled
@@ -124,6 +132,7 @@ import BValidatedInputGroupFormInput from "../../../forms/BValidatedInputGroupFo
         this.username = null;
         this.password = null;
         this.enabled = true;
+        this.repository_authentication = false;
       }
     }
   }