diff --git a/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/new/new-repository.controller.js b/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/new/new-repository.controller.js
index 2ef56143ded..4da12f4e2bb 100644
--- a/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/new/new-repository.controller.js
+++ b/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/new/new-repository.controller.js
@@ -96,7 +96,7 @@ angular.module('Bastion.repositories').controller('NewRepositoryController',
                 $scope.urlDescription = RepositoryTypesService.getAttribute($scope.repository, "url_description");
                 if ($scope.genericRemoteOptions && $scope.genericRemoteOptions !== []) {
                     $scope.genericRemoteOptions.forEach(function(option) {
-                        option.value = "";
+                        option.value = option.default ?? "";
                     });
                 }
             });
@@ -158,7 +158,7 @@ angular.module('Bastion.repositories').controller('NewRepositoryController',
 
                 if ($scope.genericRemoteOptions && $scope.genericRemoteOptions !== []) {
                     $scope.genericRemoteOptions.forEach(function(option) {
-                        if (option.type === "Array" && option.value !== "") {
+                        if (option.type === "Array" && option.value !== "" && !Array.isArray(option.value)) {
                             repository[option.name] = option.value.split(option.delimiter);
                         } else {
                             repository[option.name] = option.value;