diff --git a/app/controllers/providers/show/repositories/new.js b/app/controllers/providers/show/repositories/new.js
index a2a8399ef..00da84419 100644
--- a/app/controllers/providers/show/repositories/new.js
+++ b/app/controllers/providers/show/repositories/new.js
@@ -1,231 +1,238 @@
-import classic from 'ember-classic-decorator';
-import { action, computed } from '@ember/object';
-import { inject as service } from '@ember/service';
-import Controller from '@ember/controller';
-import { isBlank } from '@ember/utils';
-import { capitalize } from '@ember/string';
-import langs from 'langs';
-import { A } from '@ember/array';
-import { clientTypeList, softwareList } from 'bracco/models/repository';
-
-@classic
-export default class NewController extends Controller {
-  @service
-  store;
-
-  @service
-  router;
-
-  @service
-  flashMessages;
-
-  re3data = null;
-  softwareList = softwareList;
-  softwares = softwareList;
-  clientTypeList = clientTypeList;
-  clientTypes = clientTypeList;
-
-  @computed('clientTypeList', 'model.repository.clientType')
-  get clientType() {
-    return this.clientTypeList.find(
-      (item) => item.value === this.get('model.repository.clientType')
-    );
-  }
-
-  init(...args) {
-    super.init(...args);
-
-    this.repositories = this.repositories || [];
-  }
-
-  @action
-  searchRe3DataAction(query) {
-    let self = this;
-    this.store
-      .query('re3data', { query, 'page[size]': 25 })
-      .then(function (repositories) {
-        self.set('repositories', repositories);
-      })
-      .catch(function (reason) {
-        console.debug(reason);
-        self.set('repositories', []);
-      });
-  }
-
-  @action
-  selectRe3DataAction(re3data) {
-    if (re3data) {
-      let self = this;
-      this.store
-        .findRecord('re3data', re3data.id)
-        .then(function (repo) {
-          self.set('re3data', repo);
-          self.model.repository.set('clientType', 'repository');
-          self.model.repository.set(
-            're3data',
-            'https://doi.org/' + repo.get('id')
-          );
-          self.model.repository.set('name', repo.get('repositoryName'));
-          self.model.repository.set('description', repo.get('description'));
-          if (repo.get('additionalNames').length > 0) {
-            self.model.repository.set(
-              'alternateName',
-              A(repo.get('additionalNames')).get('firstObject').text
-            );
-          } else {
-            self.model.repository.set('alternateName', null);
-          }
-          self.model.repository.set('url', repo.get('repositoryUrl'));
-          if (repo.get('software').length > 0) {
-            let software = repo.get('software')[0].name;
-            if (software === 'DataVerse') {
-              software = 'Dataverse';
-            } else if (software === 'unknown') {
-              software = 'Other';
-            }
-            self.model.repository.set('software', capitalize(software));
-          }
-          if (repo.get('repositoryLanguages').length > 0) {
-            self.model.repository.set(
-              'language',
-              A(repo.get('repositoryLanguages')).map(function (l) {
-                return langs.where('2', l.text)['1'];
-              })
-            );
-          }
-          if (repo.get('types').length > 0) {
-            self.model.repository.set(
-              'repositoryType',
-              A(repo.get('types')).mapBy('text')
-            );
-          }
-          if (repo.get('certificates').length > 0) {
-            self.model.repository.set(
-              'certificate',
-              A(repo.get('certificates')).mapBy('text')
-            );
-          }
-        })
-        .catch(function (reason) {
-          console.debug(reason);
-        });
-    } else {
-      this.model.repository.set('re3data', null);
-    }
-  }
-
-  @action
-  searchClientTypeAction(query) {
-    let clientTypes = this.clientTypeList.filter(function (clientType) {
-      return clientType.label.toLowerCase().startsWith(query.toLowerCase());
-    });
-    this.set('clientTypes', clientTypes);
-  }
-
-  @action
-  selectClientTypeAction(clientType) {
-    this.model.repository.set('clientType', clientType.value);
-    this.set('clientTypes', this.clientTypeList);
-  }
-
-  @action
-  searchSoftwareAction(query) {
-    let softwares = softwareList.filter(function (software) {
-      return software.toLowerCase().startsWith(query.toLowerCase());
-    });
-    this.set('softwares', softwares);
-  }
-
-  @action
-  selectSoftwareAction(software) {
-    this.model.repository.set('software', software);
-    this.set('softwares', softwareList);
-  }
-
-  @action
-  addLanguageAction() {
-    this.model.repository.get('language').pushObject(null);
-  }
-
-  @action
-  addCertificateAction() {
-    this.model.repository.get('certificate').pushObject(null);
-  }
-
-  @action
-  addRepositoryTypeAction() {
-    this.model.repository.get('repositoryType').pushObject(null);
-  }
-
-  @action
-  submitAction(repository) {
-    let self = this;
-
-    // Remove all whitespace on domains.
-    if (this.model.repository.get('domains')) {
-      let domains = this.model.repository.get('domains');
-      this.model.repository.set('domains', domains.replace(/\s/g, ''));
-    }
-
-    repository.set(
-      'language',
-      repository.get('language').filter(function (language) {
-        return !isBlank(language);
-      })
-    );
-
-    repository.set(
-      'repositoryType',
-      repository.get('repositoryType').filter(function (repositoryType) {
-        return !isBlank(repositoryType);
-      })
-    );
-
-    repository.set(
-      'certificate',
-      repository.get('certificate').filter(function (certificate) {
-        return !isBlank(certificate);
-      })
-    );
-
-    repository
-      .save()
-      .then(function (repository) {
-        repository.prefixes.then(function (prefixes) {
-          self.router.transitionTo(
-            'repositories.show.settings',
-            self.model.repository.id,
-            {
-              queryParams: {
-                assignedPrefix:
-                  prefixes.length > 0 ? prefixes.firstObject.id : null
-              }
-            }
-          );
-        });
-      })
-      .catch(function (reason) {
-        console.debug(reason);
-        let msg = reason?.errors[0]?.title
-          ? reason.errors[0].title
-          : reason?.title
-          ? reason.title
-          : 'Cause is unknown.  Please contact support.';
-
-        self
-          .get('flashMessages')
-          .danger(
-            'An error occurred and while saving this repository.' + '  ' + msg
-          );
-      });
-  }
-
-  @action
-  cancelAction() {
-    this.model.repository.rollbackAttributes();
-    this.router.transitionTo(
-      'providers.show.repositories',
-      this.get('model.provider.id')
-    );
-  }
-}
+import classic from 'ember-classic-decorator';
+import { action, computed } from '@ember/object';
+import { inject as service } from '@ember/service';
+import Controller from '@ember/controller';
+import { isBlank } from '@ember/utils';
+import { capitalize } from '@ember/string';
+import langs from 'langs';
+import { A } from '@ember/array';
+import { clientTypeList, softwareList } from 'bracco/models/repository';
+
+@classic
+export default class NewController extends Controller {
+  @service
+  store;
+
+  @service
+  router;
+
+  @service
+  flashMessages;
+
+  re3data = null;
+  softwareList = softwareList;
+  softwares = softwareList;
+  isSoftwareFieldActive = false;
+  clientTypeList = clientTypeList;
+  clientTypes = clientTypeList;
+
+  @computed('clientTypeList', 'model.repository.clientType')
+  get clientType() {
+    return this.clientTypeList.find(
+      (item) => item.value === this.get('model.repository.clientType')
+    );
+  }
+
+  init(...args) {
+    super.init(...args);
+
+    this.repositories = this.repositories || [];
+  }
+
+  @action
+  searchRe3DataAction(query) {
+    let self = this;
+    this.store
+      .query('re3data', { query, 'page[size]': 25 })
+      .then(function (repositories) {
+        self.set('repositories', repositories);
+      })
+      .catch(function (reason) {
+        console.debug(reason);
+        self.set('repositories', []);
+      });
+  }
+
+  @action
+  selectRe3DataAction(re3data) {
+    if (re3data) {
+      let self = this;
+      this.store
+        .findRecord('re3data', re3data.id)
+        .then(function (repo) {
+          self.set('re3data', repo);
+          self.model.repository.set('clientType', 'repository');
+          self.model.repository.set(
+            're3data',
+            'https://doi.org/' + repo.get('id')
+          );
+          self.model.repository.set('name', repo.get('repositoryName'));
+          self.model.repository.set('description', repo.get('description'));
+          if (repo.get('additionalNames').length > 0) {
+            self.model.repository.set(
+              'alternateName',
+              A(repo.get('additionalNames')).get('firstObject').text
+            );
+          } else {
+            self.model.repository.set('alternateName', null);
+          }
+          self.model.repository.set('url', repo.get('repositoryUrl'));
+          if (repo.get('software').length > 0) {
+            let software = repo.get('software')[0].name;
+            if (software === 'DataVerse') {
+              software = 'Dataverse';
+            } else if (software === 'unknown') {
+              software = 'Other';
+            }
+            self.model.repository.set('software', capitalize(software));
+          }
+          if (repo.get('repositoryLanguages').length > 0) {
+            self.model.repository.set(
+              'language',
+              A(repo.get('repositoryLanguages')).map(function (l) {
+                return langs.where('2', l.text)['1'];
+              })
+            );
+          }
+          if (repo.get('types').length > 0) {
+            self.model.repository.set(
+              'repositoryType',
+              A(repo.get('types')).mapBy('text')
+            );
+          }
+          if (repo.get('certificates').length > 0) {
+            self.model.repository.set(
+              'certificate',
+              A(repo.get('certificates')).mapBy('text')
+            );
+          }
+        })
+        .catch(function (reason) {
+          console.debug(reason);
+        });
+    } else {
+      this.model.repository.set('re3data', null);
+    }
+  }
+
+  @action
+  searchClientTypeAction(query) {
+    let clientTypes = this.clientTypeList.filter(function (clientType) {
+      return clientType.label.toLowerCase().startsWith(query.toLowerCase());
+    });
+    this.set('clientTypes', clientTypes);
+  }
+
+  @action
+  selectClientTypeAction(clientType) {
+    this.model.repository.set('clientType', clientType.value);
+    this.set('clientTypes', this.clientTypeList);
+  }
+
+  @action
+  searchSoftwareAction(query) {
+    let softwares = softwareList.filter(function (software) {
+      return software.toLowerCase().startsWith(query.toLowerCase());
+    });
+    this.set('softwares', softwares);
+  }
+
+  @action
+  selectSoftwareAction(software) {
+    this.model.repository.set('software', software);
+    this.set('softwares', softwareList);
+  }
+
+  @action
+  addLanguageAction() {
+    this.model.repository.get('language').pushObject(null);
+  }
+
+  @action
+  addCertificateAction() {
+    this.model.repository.get('certificate').pushObject(null);
+  }
+
+  @action
+  addRepositoryTypeAction() {
+    this.model.repository.get('repositoryType').pushObject(null);
+  }
+
+  @action
+  submitAction(repository) {
+    let self = this;
+
+    // Remove all whitespace on domains.
+    if (this.model.repository.get('domains')) {
+      let domains = this.model.repository.get('domains');
+      this.model.repository.set('domains', domains.replace(/\s/g, ''));
+    }
+
+    repository.set(
+      'language',
+      repository.get('language').filter(function (language) {
+        return !isBlank(language);
+      })
+    );
+
+    repository.set(
+      'repositoryType',
+      repository.get('repositoryType').filter(function (repositoryType) {
+        return !isBlank(repositoryType);
+      })
+    );
+
+    repository.set(
+      'certificate',
+      repository.get('certificate').filter(function (certificate) {
+        return !isBlank(certificate);
+      })
+    );
+
+    repository
+      .save()
+      .then(function (repository) {
+        repository.prefixes.then(function (prefixes) {
+          self.router.transitionTo(
+            'repositories.show.settings',
+            self.model.repository.id,
+            {
+              queryParams: {
+                assignedPrefix:
+                  prefixes.length > 0 ? prefixes.firstObject.id : null
+              }
+            }
+          );
+        });
+      })
+      .catch(function (reason) {
+        console.debug(reason);
+        let msg = reason?.errors[0]?.title
+          ? reason.errors[0].title
+          : reason?.title
+          ? reason.title
+          : 'Cause is unknown.  Please contact support.';
+
+        self
+          .get('flashMessages')
+          .danger(
+            'An error occurred and while saving this repository.' + '  ' + msg
+          );
+      });
+  }
+
+  @action
+  cancelAction() {
+    this.model.repository.rollbackAttributes();
+    this.router.transitionTo(
+      'providers.show.repositories',
+      this.get('model.provider.id')
+    );
+  }
+
+  // This helps to manage the validation state of the software field.  The field is required, but we don't want to show it as invalid until the user has interacted with it.
+  @action
+  activateSoftwareField() {
+    return this.set('isSoftwareFieldActive', true);
+  }
+}
diff --git a/app/controllers/repositories/show/edit.js b/app/controllers/repositories/show/edit.js
index 50b3b1850..c3362bcd7 100644
--- a/app/controllers/repositories/show/edit.js
+++ b/app/controllers/repositories/show/edit.js
@@ -29,6 +29,7 @@ export default class EditController extends Controller {
   re3data = null;
   softwareList = softwareList;
   softwares = softwareList;
+  isSoftwareFieldActive = false;
   clientTypeList = clientTypeList;
   clientTypes = clientTypeList;
 
@@ -185,4 +186,10 @@ export default class EditController extends Controller {
     this.model.rollbackAttributes();
     this.router.transitionTo('repositories.show', this.model);
   }
+
+  // This helps to manage the validation state of the software field.  The field is required, but we don't want to show it as invalid until the user has interacted with it.
+  @action
+  activateSoftwareField() {
+    return this.set('isSoftwareFieldActive', true);
+  }
 }
diff --git a/app/models/repository.js b/app/models/repository.js
index 35c4bfc3b..605dac095 100644
--- a/app/models/repository.js
+++ b/app/models/repository.js
@@ -156,6 +156,9 @@ const Validations = buildValidations({
       allowBlank: true,
       message: 'ISSN (print) is in the wrong format.'
     })
+  ],
+  software: [
+    validator('presence', true)
   ]
 });
 
diff --git a/app/routes/providers/show/repositories/new.js b/app/routes/providers/show/repositories/new.js
index f09ee530b..7290f62f9 100644
--- a/app/routes/providers/show/repositories/new.js
+++ b/app/routes/providers/show/repositories/new.js
@@ -37,4 +37,22 @@ export default class NewRoute extends Route {
       })
     });
   }
+
+  setupController(controller, model) {
+    // Call _super to maintain default behavior (controller.set('model', model))
+    super.setupController(controller, model);
+
+    // Custom setup: Set additional properties
+    controller.set('isSoftwareFieldActive', false);
+  }
+
+  resetController(controller, isExiting, transition) {
+    // If the user is exiting the route entirely, reset the transient properties
+    if (isExiting) {
+      controller.set('isSoftwareFieldActive', false);
+    }
+
+    // Calls the default resetController behavior (important for query params)
+    super.resetController(controller, isExiting, transition);
+  }
 }
diff --git a/app/routes/repositories/show/edit.js b/app/routes/repositories/show/edit.js
index fa6c5c4ca..48a47b325 100644
--- a/app/routes/repositories/show/edit.js
+++ b/app/routes/repositories/show/edit.js
@@ -39,5 +39,16 @@ export default class EditRoute extends Route {
 
     controller.set('clientTypeList', filteredClientTypeList);
     controller.set('clientTypes', filteredClientTypeList);
+    controller.set('isSoftwareFieldActive', false);
+  }
+
+  resetController(controller, isExiting, transition) {
+    // If the user is exiting the route entirely, reset the transient properties
+    if (isExiting) {
+      controller.set('isSoftwareFieldActive', false);
+    }
+
+    // Calls the default resetController behavior (important for query params)
+    super.resetController(controller, isExiting, transition);
   }
 }
diff --git a/app/styles/local.css b/app/styles/local.css
index eef6441af..e62f8aea4 100755
--- a/app/styles/local.css
+++ b/app/styles/local.css
@@ -147,7 +147,6 @@ div[doi-format].power-select-fragment .ember-basic-dropdown-trigger div.ember-vi
 /*  VALIDATION - FORM-GROUPS */
 
 .form-group .form-text {
-  font-size: 16px;
   display: block;
   margin-top: 5px;
   margin-bottom: 10px;
@@ -555,7 +554,6 @@ div[doi-publisher] > div {
 .form-group input.is-valid + div.form-text {
     color: #2ecc71;
 }
-*/
 
 /* VALIDATION - text areas (Mostly in doi form upload.) */
 
diff --git a/app/templates/providers/show/repositories/new.hbs b/app/templates/providers/show/repositories/new.hbs
index 36e7b5977..c350dc0fe 100644
--- a/app/templates/providers/show/repositories/new.hbs
+++ b/app/templates/providers/show/repositories/new.hbs
@@ -1,159 +1,158 @@
-<div class="panel panel-transparent">
-  <div class="panel-body">
-    <div class="col-md-9 col-md-offset-3"><h3 class="edit">Add Repository</h3>
-      {{#each this.flashMessages.queue as |flash|}}
-        <FlashMessage @flash={{flash}} />
-      {{/each}}
-    </div>
-
-    <BsForm @formLayout="horizontal" class="form-horizontal" @horizontalLabelGridClass="col-md-3" @model={{this.model.repository}} @onSubmit={{action "submitAction" this.model.repository this.model}} @submitOnEnter={{true}} as |form|>
-      <RepositoryId @model={{this.model.repository}} @provider={{this.model.provider}} @form={{form}} />
-      
-      <form.element @controlType="power-select" id="client-type" class="form-group" @label="Type" @value={{this.clientType}} @options={{this.clientTypes}} @optionLabelPath="label" as |el|>
-        <el.control @onChange={{action "selectClientTypeAction"}} @search={{action "searchClientTypeAction"}} @placeholder="Select Client Type" @searchPlaceholder="Type to search..." @searchEnabled={{true}} />
-      {{#if (eq this.model.repository.clientType "igsnCatalog")}}
-        <div class="help-block help-block-fragment" data-igsn-catalog-help>This repository will only be able to mint IGSN IDs.</div>
-      {{/if}}
-      </form.element>
-
-      {{#if (can "create provider")}}
-        <form.element @controlType="text" id="salesforce-id" class="form-group" @label="Salesforce ID" @property="salesforceId" @helpText="The 18 digit ID in Salesforce." />
-        <form.element @controlType="text" id="analytics-tracking-id" class="form-group" @label="Analytics Tracking ID (optional)" @property="analyticsTrackingId" @helpText="The Analytics Tracking ID used to generate usage reports." />
-      {{/if}}
-
-      {{#if (can "token provider")}}
-        <form.element @controlType="text" id="globus-uuid" class="form-group" @label="Globus UUID (optional)" @property="globusUuid" @helpText="The Globus UUID used for token authentication." />
-      {{/if}}
-
-      {{#if (eq this.model.repository.clientType "periodical")}}
-        <RepositoryIssn @model={{this.model.repository}} @fragment={{this.model.repository.issn}} @form={{form}} />
-      {{else}}
-        <form.element @controlType="power-select" id="re3data" class="form-group" @property="re3data" @label="re3data Record (optional)" @optionLabelPath="re3data" @options={{this.repositories}} @destination={{this.re3data}} @helpText="re3data is a registry of research data repositories." as |el|>
-          <el.control @onChange={{action "selectRe3DataAction"}} @search={{action "searchRe3DataAction"}} @searchField="repositoryName" @searchPlaceholder="Type to search..." @allowClear={{true}} @searchEnabled={{true}} as |item|>
-            {{if item.name item.name this.model.repository.re3data}}
-          </el.control>
-        </form.element>
-      {{/if}}
-
-      <form.element @controlType="text" id="name" class="form-group" @label="Repository Name" @property="name" @useIcons={{false}} />
-      <form.element @controlType="text" id="alternate-name" class="form-group" @label="Repository Alternate Name (optional)" @property="alternateName" />
-      <form.element @controlType="email" id="system-email" class="form-group" @label="System Email" @property="systemEmail" @helpText="This is the email used for sending password reset requests and similar system notifications." @useIcons={{false}} />
-
-      <div id="service-contact" class="form-group">
-        <label class="control-label col-md-3">Service Contact (optional)</label>
-        <div class="col-md-9">
-          <div>
-            <label for="givenName" class="subtitle">Given Name (optional)</label>
-            <Input @type="text" class="form-control" id="service-contact-given-name" @value={{this.model.repository.serviceContact.givenName}} required={{false}} />
-          </div>
-          <div>
-            <label for="familyName" class="subtitle">Family Name (optional)</label>
-            <Input @type="text" class="form-control" id="service-contact-family-name" @value={{this.model.repository.serviceContact.familyName}} required={{false}} />
-          </div>
-          <div class="{{if (v-get this.model.repository.serviceContact 'isInvalid') 'has-error has-feedback'}}">
-            <label for="email" class="subtitle control-label">Email (optional)</label>
-            <Input @type="text" class="form-control" id="service-contact-email" @value={{this.model.repository.serviceContact.email}} required={{false}} />
-            {{#if (v-get this.model.repository.serviceContact 'isInvalid')}}
-              <div class="help-block help-block-fragment" data-test-service-contact-email-help>{{v-get this.model.repository.serviceContact 'message'}}</div>
-            {{/if}}
-          </div>
-        </div>
-      </div>
-
-      <form.element @controlType="textarea" id="description" class="form-group" @label="Description (optional)" @property="description" @helpText="Description of the repository. Please use markdown for formatting." as |el| >
-        <el.control rows="10" />
-      </form.element>
-      <form.element @controlType="text" id="url" class="form-group" @label="URL (optional)" @property="url" @helpText="The homepage of the repository." />
-
-      <div class="form-group" id="language">
-        <label class="control-label col-md-3">Language (optional)</label>
-        <div class="col-md-9">
-          {{#if (gt this.model.repository.language.length 0)}}
-            {{#each this.model.repository.language as |language index|}}
-              <RepositoryLanguage @model={{this.model.repository}} @language={{language}} @form={{form}} @index={{index}} />
-            {{/each}}
-          {{/if}}
-          {{#if (lte this.model.repository.language.length 2)}}
-            <BsButton class="btn-sm add-language" @outline={{true}} @onClick={{action "addLanguageAction"}}><i class="fas fa-plus-circle"></i> Add Language</BsButton>
-          {{/if}}
-        </div>
-      </div>
-
-      <form.element id="software" class="form-group" @controlType="power-select" @label="Software (optional)" @property="software" @options={{this.softwares}} @destination={{this.software}} @helpText="The name of the software that is used to run the repository." as |el|>
-        <el.control @onChange={{action "selectSoftwareAction"}} @search={{action "searchSoftwareAction"}} @placeholder="Select Software" @searchPlaceholder="Type to search..." @allowClear={{true}} @searchEnabled={{true}} as |item|>
-          {{item}}
-        </el.control>
-      </form.element>
-      <form.element @controlType="textarea" id="domains" class="form-group" @label="Domains" @property="domains">
-        <Input @type="textarea" class="form-control" @value={{this.model.repository.domains}} />
-        <div class="form-text">
-          <div>Define which domains or subdomains can be used for DOI URLs in the repository.</div>
-          <div>Use <code>*</code> to allow all domains, specify an exact domain (e.g., <code>example.org</code> or <code>www.example.org</code>), or use <code>*.</code> before a domain to allow only its subdomains (e.g., <code>*.example.org</code>). You can also separate multiple entries with commas (e.g., <code>example.org,*.example.org,www.secondexample.org</code>). <a href="https://support.datacite.org/docs/update-repository-settings#domains" target="_blank" rel="noopener noreferrer">Learn more...</a></div>
-        </div>
-      </form.element>
-
-      {{#unless (eq this.model.repository.clientType "periodical")}}
-        <div class="form-group" id="repository-type">
-          <label class="control-label col-md-3">Repository Type (optional)</label>
-          <div class="col-md-9">
-            {{#if (gt this.model.repository.repositoryType.length 0)}}
-              {{#each this.model.repository.repositoryType as |repositoryType index|}}
-                <RepositoryRepositoryType @model={{this.model.repository}} @repositoryType={{repositoryType}} @form={{form}} @index={{index}} />
-              {{/each}}
-            {{/if}}
-            {{#if (lte this.model.repository.repositoryType.length 2)}}
-              <BsButton class="btn-sm add-repositoryType" @outline={{true}} @onClick={{action "addRepositoryTypeAction"}}><i class="fas fa-plus-circle"></i> Add Repository Type</BsButton>
-            {{/if}}
-          </div>
-        </div>
-
-        {{#if this.model.repository.isDisciplinary }}
-          <DoiSubjects @model={{this.model.repository}} @form={{form}} />
-        {{/if}}
-
-        <div class="form-group" id="certificate">
-          <label class="control-label col-md-3">Certificate (optional)</label>
-          <div class="col-md-9">
-            {{#if (gt this.model.repository.certificate.length 0)}}
-              {{#each this.model.repository.certificate as |certificate index|}}
-                <RepositoryCertificate @model={{this.model.repository}} @certificate={{certificate}} @form={{form}} @index={{index}} />
-              {{/each}}
-            {{/if}}
-            {{#if (lte this.model.repository.certificate.length 2)}}
-              <BsButton class="btn-sm add-certificate" @outline={{true}} @onClick={{action "addCertificateAction"}}><i class="fas fa-plus-circle"></i> Add Certificate</BsButton>
-            {{/if}}
-          </div>
-        </div>
-      {{/unless}}
-
-      <form.element @controlType="checkbox" id="is-active" class="form-group" @label="Account is active" @property="isActive" @helpText="This account can register and update DOIs" as |el| >
-        <el.control id="is-active-field" />
-      </form.element>
-
-      <div class="col-md-offset-3">
-        <BsAlert @dismissible={{false}} class="opt-in" @type="warning">
-          The contacts entered may receive notifications about administration, webinars, product testing,
-          or news that will impact the use of DataCite services and/or membership. Individuals may remove
-          themselves from mailings by following the unsubscribe link provided in every DataCite email.
-          For information about our privacy practices and commitment to protecting your privacy, please
-          review our <a target="_blank" rel="noopener noreferrer" href={{get (links) "PRIVACY_POLICY_URL" }}>Privacy Policy</a>.
-        </BsAlert>
-      </div>
-
-      <div class="col-md-9 col-md-offset-3">
-        {{#if (is-empty (repository-form-errors this.model.repository))}}
-          <button type="submit" id="add-repository" class="btn btn-sm btn-fill" disabled={{false}}>Add Repository</button>
-        {{else}}
-          <BsAlert @dismissible={{false}} @type="danger">
-            To save this repository, first resolve the errors with these fields: {{repository-form-errors this.model.repository}}.
-          </BsAlert>
-
-          <button type="submit" id="add-repository" class="btn btn-sm btn-fill" disabled={{true}}>Add Repository</button>
-        {{/if}}
-
-        <button class="btn btn-sm" type="button" {{action "cancelAction"}}>Cancel</button>
-      </div>
-
-    </BsForm>
-  </div>
-</div>
+<div class="panel panel-transparent">
+  <div class="panel-body">
+    <div class="col-md-9 col-md-offset-3"><h3 class="edit">Add Repository</h3>
+      {{#each this.flashMessages.queue as |flash|}}
+        <FlashMessage @flash={{flash}} />
+      {{/each}}
+    </div>
+
+    <BsForm @formLayout="horizontal" class="form-horizontal" @horizontalLabelGridClass="col-md-3" @model={{this.model.repository}} @onSubmit={{action "submitAction" this.model.repository this.model}} @submitOnEnter={{true}} as |form|>
+      <RepositoryId @model={{this.model.repository}} @provider={{this.model.provider}} @form={{form}} />
+      
+      <form.element @controlType="power-select" id="client-type" class="form-group" @label="Type" @value={{this.clientType}} @options={{this.clientTypes}} @optionLabelPath="label" as |el|>
+        <el.control @onChange={{action "selectClientTypeAction"}} @search={{action "searchClientTypeAction"}} @placeholder="Select Client Type" @searchPlaceholder="Type to search..." @searchEnabled={{true}} />
+      {{#if (eq this.model.repository.clientType "igsnCatalog")}}
+        <div class="help-block help-block-fragment" data-igsn-catalog-help>This repository will only be able to mint IGSN IDs.</div>
+      {{/if}}
+      </form.element>
+
+      {{#if (can "create provider")}}
+        <form.element @controlType="text" id="salesforce-id" class="form-group" @label="Salesforce ID" @property="salesforceId" @helpText="The 18 digit ID in Salesforce." />
+        <form.element @controlType="text" id="analytics-tracking-id" class="form-group" @label="Analytics Tracking ID (optional)" @property="analyticsTrackingId" @helpText="The Analytics Tracking ID used to generate usage reports." />
+      {{/if}}
+
+      {{#if (can "token provider")}}
+        <form.element @controlType="text" id="globus-uuid" class="form-group" @label="Globus UUID (optional)" @property="globusUuid" @helpText="The Globus UUID used for token authentication." />
+      {{/if}}
+
+      {{#if (eq this.model.repository.clientType "periodical")}}
+        <RepositoryIssn @model={{this.model.repository}} @fragment={{this.model.repository.issn}} @form={{form}} />
+      {{else}}
+        <form.element @controlType="power-select" id="re3data" class="form-group" @property="re3data" @label="re3data Record (optional)" @optionLabelPath="re3data" @options={{this.repositories}} @destination={{this.re3data}} @helpText="re3data is a registry of research data repositories." as |el|>
+          <el.control @onChange={{action "selectRe3DataAction"}} @search={{action "searchRe3DataAction"}} @searchField="repositoryName" @searchPlaceholder="Type to search..." @allowClear={{true}} @searchEnabled={{true}} as |item|>
+            {{if item.name item.name this.model.repository.re3data}}
+          </el.control>
+        </form.element>
+      {{/if}}
+
+      <form.element @controlType="text" id="name" class="form-group" @label="Repository Name" @property="name" @useIcons={{false}} />
+      <form.element @controlType="text" id="alternate-name" class="form-group" @label="Repository Alternate Name (optional)" @property="alternateName" />
+      <form.element @controlType="email" id="system-email" class="form-group" @label="System Email" @property="systemEmail" @helpText="This is the email used for sending password reset requests and similar system notifications." @useIcons={{false}} />
+
+      <div id="service-contact" class="form-group">
+        <label class="control-label col-md-3">Service Contact (optional)</label>
+        <div class="col-md-9">
+          <div>
+            <label for="givenName" class="subtitle">Given Name (optional)</label>
+            <Input @type="text" class="form-control" id="service-contact-given-name" @value={{this.model.repository.serviceContact.givenName}} required={{false}} />
+          </div>
+          <div>
+            <label for="familyName" class="subtitle">Family Name (optional)</label>
+            <Input @type="text" class="form-control" id="service-contact-family-name" @value={{this.model.repository.serviceContact.familyName}} required={{false}} />
+          </div>
+          <div class="{{if (v-get this.model.repository.serviceContact 'isInvalid') 'has-error has-feedback'}}">
+            <label for="email" class="subtitle control-label">Email (optional)</label>
+            <Input @type="text" class="form-control" id="service-contact-email" @value={{this.model.repository.serviceContact.email}} required={{false}} />
+            {{#if (v-get this.model.repository.serviceContact 'isInvalid')}}
+              <div class="help-block help-block-fragment" data-test-service-contact-email-help>{{v-get this.model.repository.serviceContact 'message'}}</div>
+            {{/if}}
+          </div>
+        </div>
+      </div>
+
+      <form.element @controlType="textarea" id="description" class="form-group" @label="Description (optional)" @property="description" @helpText="Description of the repository. Please use markdown for formatting." as |el| >
+        <el.control rows="10" />
+      </form.element>
+      <form.element @controlType="text" id="url" class="form-group" @label="URL (optional)" @property="url" @helpText="The homepage of the repository." />
+
+      <div class="form-group" id="language">
+        <label class="control-label col-md-3">Language (optional)</label>
+        <div class="col-md-9">
+          {{#if (gt this.model.repository.language.length 0)}}
+            {{#each this.model.repository.language as |language index|}}
+              <RepositoryLanguage @model={{this.model.repository}} @language={{language}} @form={{form}} @index={{index}} />
+            {{/each}}
+          {{/if}}
+          {{#if (lte this.model.repository.language.length 2)}}
+            <BsButton class="btn-sm add-language" @outline={{true}} @onClick={{action "addLanguageAction"}}><i class="fas fa-plus-circle"></i> Add Language</BsButton>
+          {{/if}}
+        </div>
+      </div>
+      <form.element id="software" class="form-group required-label {{if (and this.isSoftwareFieldActive (v-get this.model.repository 'software' 'isInvalid')) 'has-error'}}" @controlType="power-select" @label="Software" @property="software" @options={{this.softwares}} @destination={{this.software}} @helpText="The name of the software that is used to run the repository. Select 'Other' if your repository software is not listed." as |el|>
+        <el.control {{on "click" this.activateSoftwareField}} @onChange={{action "selectSoftwareAction"}} @search={{action "searchSoftwareAction"}} @placeholder="Select Software" @searchPlaceholder="Type to search..." @allowClear={{true}} @searchEnabled={{true}} as |item|>
+          {{item}}
+        </el.control>
+      </form.element>
+      <form.element @controlType="textarea" id="domains" class="form-group" @label="Domains" @property="domains">
+        <Input @type="textarea" class="form-control" @value={{this.model.repository.domains}} />
+        <div class="form-text">
+          <div>Define which domains or subdomains can be used for DOI URLs in the repository.</div>
+          <div>Use <code>*</code> to allow all domains, specify an exact domain (e.g., <code>example.org</code> or <code>www.example.org</code>), or use <code>*.</code> before a domain to allow only its subdomains (e.g., <code>*.example.org</code>). You can also separate multiple entries with commas (e.g., <code>example.org,*.example.org,www.secondexample.org</code>). <a href="https://support.datacite.org/docs/update-repository-settings#domains" target="_blank" rel="noopener noreferrer">Learn more...</a></div>
+        </div>
+      </form.element>
+
+      {{#unless (eq this.model.repository.clientType "periodical")}}
+        <div class="form-group" id="repository-type">
+          <label class="control-label col-md-3">Repository Type (optional)</label>
+          <div class="col-md-9">
+            {{#if (gt this.model.repository.repositoryType.length 0)}}
+              {{#each this.model.repository.repositoryType as |repositoryType index|}}
+                <RepositoryRepositoryType @model={{this.model.repository}} @repositoryType={{repositoryType}} @form={{form}} @index={{index}} />
+              {{/each}}
+            {{/if}}
+            {{#if (lte this.model.repository.repositoryType.length 2)}}
+              <BsButton class="btn-sm add-repositoryType" @outline={{true}} @onClick={{action "addRepositoryTypeAction"}}><i class="fas fa-plus-circle"></i> Add Repository Type</BsButton>
+            {{/if}}
+          </div>
+        </div>
+
+        {{#if this.model.repository.isDisciplinary }}
+          <DoiSubjects @model={{this.model.repository}} @form={{form}} />
+        {{/if}}
+
+        <div class="form-group" id="certificate">
+          <label class="control-label col-md-3">Certificate (optional)</label>
+          <div class="col-md-9">
+            {{#if (gt this.model.repository.certificate.length 0)}}
+              {{#each this.model.repository.certificate as |certificate index|}}
+                <RepositoryCertificate @model={{this.model.repository}} @certificate={{certificate}} @form={{form}} @index={{index}} />
+              {{/each}}
+            {{/if}}
+            {{#if (lte this.model.repository.certificate.length 2)}}
+              <BsButton class="btn-sm add-certificate" @outline={{true}} @onClick={{action "addCertificateAction"}}><i class="fas fa-plus-circle"></i> Add Certificate</BsButton>
+            {{/if}}
+          </div>
+        </div>
+      {{/unless}}
+
+      <form.element @controlType="checkbox" id="is-active" class="form-group" @label="Account is active" @property="isActive" @helpText="This account can register and update DOIs" as |el| >
+        <el.control id="is-active-field" />
+      </form.element>
+
+      <div class="col-md-offset-3">
+        <BsAlert @dismissible={{false}} class="opt-in" @type="warning">
+          The contacts entered may receive notifications about administration, webinars, product testing,
+          or news that will impact the use of DataCite services and/or membership. Individuals may remove
+          themselves from mailings by following the unsubscribe link provided in every DataCite email.
+          For information about our privacy practices and commitment to protecting your privacy, please
+          review our <a target="_blank" rel="noopener noreferrer" href={{get (links) "PRIVACY_POLICY_URL" }}>Privacy Policy</a>.
+        </BsAlert>
+      </div>
+
+      <div class="col-md-9 col-md-offset-3">
+        {{#if (is-empty (repository-form-errors this.model.repository))}}
+          <button type="submit" id="add-repository" class="btn btn-sm btn-fill" disabled={{false}}>Add Repository</button>
+        {{else}}
+          <BsAlert @dismissible={{false}} @type="danger">
+            To save this repository, first resolve the errors with these fields: {{repository-form-errors this.model.repository}}.
+          </BsAlert>
+
+          <button type="submit" id="add-repository" class="btn btn-sm btn-fill" disabled={{true}}>Add Repository</button>
+        {{/if}}
+
+        <button class="btn btn-sm" type="button" {{action "cancelAction"}}>Cancel</button>
+      </div>
+
+    </BsForm>
+  </div>
+</div>
diff --git a/app/templates/repositories/show/edit.hbs b/app/templates/repositories/show/edit.hbs
index 967dc32e9..262c189eb 100644
--- a/app/templates/repositories/show/edit.hbs
+++ b/app/templates/repositories/show/edit.hbs
@@ -1,160 +1,160 @@
-<div class="panel panel-transparent" id="content-member">
-  <div class="panel-body">
-    <div class="col-md-9 col-md-offset-3"><h3 class="edit">Update {{if (eq this.currentUser.uid this.model.id) 'Account' 'Repository'}}</h3>
-      {{#each this.flashMessages.queue as |flash|}}
-        <FlashMessage @flash={{flash}} />
-      {{/each}}
-    </div>
-
-    <BsForm @formLayout="horizontal" class="form-horizontal" @horizontalLabelGridClass="col-md-3" @model={{this.model}} @onSubmit={{action "submitAction" this.model}} @submitOnEnter={{true}} as |form|>
-      <form.element @controlType="text" id="repository-id" class="form-group" @label="Repository ID" @property="symbol" @helpText="The Repository ID is the unique identifier for each repository in DataCite and can't be changed." as |el| >
-        <el.control disabled={{true}} />
-      </form.element>
-      <form.element @controlType="power-select" id="client-type" class="form-group" @label="Type" @value={{this.clientType}} @options={{this.clientTypes}} @optionLabelPath="label" as |el|>
-        <el.control @onChange={{action "selectClientTypeAction"}} @search={{action "searchClientTypeAction"}} @placeholder="Select Client Type" @searchPlaceholder="Type to search..." @disabled={{if (eq this.model.clientType "igsnCatalog") true false}} @searchEnabled={{true}}/>
-        {{#if (eq this.model.clientType "igsnCatalog")}}
-          <BsTooltip @renderInPlace={{true}} @placement="top" @viewportPadding={{10}}>IGSN ID Catalogs cannot be edited.</BsTooltip>
-        {{/if}}
-      </form.element>
-
-      {{#if (can "create provider")}}
-        <form.element @controlType="text" id="salesforce-id" class="form-group" @label="Salesforce ID" @property="salesforceId" @helpText="The 18 digit ID in Salesforce." />
-        <form.element @controlType="text" id="analytics-tracking-id" class="form-group" @label="Analytics Tracking ID (optional)" @property="analyticsTrackingId" @helpText="The Analytics Tracking ID used to generate usage reports." />
-      {{/if}}
-
-      {{#if (can "token provider")}}
-        <form.element @controlType="text" id="globus-uuid" class="form-group" @label="Globus UUID (optional)" @property="globusUuid" @helpText="The Globus UUID used for token authentication." />
-      {{/if}}
-
-      {{#if (eq this.model.clientType "periodical")}}
-        <RepositoryIssn @model={{this.model}} @fragment={{this.model.issn}} @form={{form}} />
-      {{else}}
-        <form.element @controlType="power-select" id="re3data" class="form-group" @property="re3data" @label="re3data Record (optional)" @optionLabelPath="re3data" @options={{this.repositories}} @destination={{this.re3data}} @helpText="re3data is a registry of research data repositories." as |el|>
-          <el.control @onChange={{action "selectRe3DataAction"}} @search={{action "searchRe3DataAction"}} @searchField="repositoryName" @searchPlaceholder="Type to search..." @allowClear={{true}} @searchEnabled={{true}} as |item|>
-            {{if item.name item.name this.model.re3data}}
-          </el.control>
-        </form.element>
-      {{/if}}
-
-      <form.element @controlType="text" id="name" class="form-group" @label="Repository Name" @property="name" as |el| ><el.control id="name-field" /></form.element>
-      <form.element @controlType="text" id="alternate-name" class="form-group" @label="Repository Alternate Name (optional)" @property="alternateName" />
-      <form.element @controlType="email" id="system-email" class="form-group" @label="System Email" @property="systemEmail" @helpText="This is the email used for sending password reset requests and similar system notifications." />
-
-      <div class="form-group">
-        <label class="control-label col-md-3">Service Contact (optional)</label>
-        <div class="col-md-9">
-          <div>
-            <label for="givenName" class="subtitle">Given Name (optional)</label>
-            <Input @type="text" class="form-control" id="service-contact-given-name" @value={{this.model.serviceContact.givenName}} required={{false}} />
-          </div>
-          <div>
-            <label for="familyName" class="subtitle">Family Name (optional)</label>
-            <Input @type="text" class="form-control" id="service-contact-family-name" @value={{this.model.serviceContact.familyName}} required={{false}} />
-          </div>
-          <div class="{{if (v-get this.model.serviceContact 'isInvalid') 'has-error has-feedback'}}">
-            <label for="email" class="subtitle control-label">Email (optional)</label>
-            <Input @type="text" class="form-control" id="service-contact-email" @value={{this.model.serviceContact.email}} required={{false}} />
-            {{#if (v-get this.model.serviceContact 'isInvalid')}}
-              <div class="help-block help-block-fragment" data-test-service-contact-email-help>{{v-get this.model.serviceContact 'message'}}</div>
-            {{/if}}
-          </div>
-        </div>
-      </div>
-
-      <form.element @controlType="textarea" id="description" class="form-group" @label="Description (optional)" @property="description" @helpText="Description of the repository. Please use markdown for formatting." as |el| ><el.control rows="10" /></form.element>
-      <form.element @controlType="text" id="url" class="form-group" @label="URL (optional)" @property="url" @helpText="The homepage of the repository." />
-
-      <div class="form-group" id="language">
-        <label class="control-label col-md-3">Language (optional)</label>
-        <div class="col-md-9">
-          {{#if (gt this.model.language.length 0)}}
-            {{#each this.model.language as |language index|}}
-              <RepositoryLanguage @model={{this.model}} @language={{language}} @form={{form}} @index={{index}} />
-            {{/each}}
-          {{/if}}
-          {{#if (lte this.model.language.length 2)}}
-            <BsButton class="btn-sm add-language" @outline={{true}} @onClick={{action "addLanguageAction"}}><i class="fas fa-plus-circle"></i> Add Language</BsButton>
-          {{/if}}
-        </div>
-      </div>
-
-      <form.element @controlType="power-select" id="software" class="form-group" @label="Software (optional)" @property="software" @options={{this.softwares}} @destination={{this.software}} @helpText="The name of the software that is used to run the repository." as |el|>
-        <el.control @onChange={{action "selectSoftwareAction"}} @search={{action "searchSoftwareAction"}} @placeholder="Select Software" @searchPlaceholder="Type to search..." @allowClear={{true}} @searchEnabled={{true}} as |item|>
-          {{item}}
-        </el.control>
-      </form.element>
-      <form.element @controlType="textarea" id="domains" class="form-group" @label="Domains" @property="domains">
-        <Input @type="textarea" class="form-control" @value={{this.model.domains}} />
-        <div class="form-text">
-          <div>Define which domains or subdomains can be used for DOI URLs in the repository.</div>
-          <div>Use <code>*</code> to allow all domains, specify an exact domain (e.g., <code>example.org</code> or <code>www.example.org</code>), or use <code>*.</code> before a domain to allow only its subdomains (e.g., <code>*.example.org</code>). You can also separate multiple entries with commas (e.g., <code>example.org,*.example.org,www.secondexample.org</code>). <a href="https://support.datacite.org/docs/update-repository-settings#domains" target="_blank" rel="noopener noreferrer">Learn more...</a></div>
-        </div>
-      </form.element>
-
-      {{#unless (eq this.model.clientType "periodical")}}
-        <div class="form-group" id="repository-type">
-          <label class="control-label col-md-3">Repository Type (optional)</label>
-          <div class="col-md-9">
-            {{#if (gt this.model.repositoryType.length 0)}}
-              {{#each this.model.repositoryType as |repositoryType index|}}
-                <RepositoryRepositoryType @model={{this.model}} @repositoryType={{repositoryType}} @form={{form}} @index={{index}} />
-              {{/each}}
-            {{/if}}
-            {{#if (lte this.model.repositoryType.length 2)}}
-              <BsButton class="btn-sm add-repositoryType" @outline={{true}} @onClick={{action "addRepositoryTypeAction"}}><i class="fas fa-plus-circle"></i> Add Repository Type</BsButton>
-            {{/if}}
-          </div>
-        </div>
-
-
-        {{#if this.model.isDisciplinary }}
-        <RepositorySubjects @model={{this.model}} @form={{form}} />
-        {{/if}}
-
-        <div class="form-group" id="certificate">
-          <label class="control-label col-md-3">Certificate (optional)</label>
-          <div class="col-md-9">
-            {{#if (gt this.model.certificate.length 0)}}
-              {{#each this.model.certificate as |certificate index|}}
-                <RepositoryCertificate @model={{this.model}} @certificate={{certificate}} @form={{form}} @index={{index}} />
-              {{/each}}
-            {{/if}}
-            {{#if (lte this.model.certificate.length 2)}}
-              <BsButton class="btn-sm add-certificate" @outline={{true}} @onClick={{action "addCertificateAction"}}><i class="fas fa-plus-circle"></i> Add Certificate</BsButton>
-            {{/if}}
-          </div>
-        </div>
-      {{/unless}}
-
-      {{#if (can "create repository" this.model)}}
-        <form.element @controlType="checkbox" id="is-active" class="form-group" @label="Account is active" @property="isActive" @helpText="This account can register and update DOIs" as |el| >
-          <el.control id="is-active-field" />
-        </form.element>
-      {{/if}}
-
-      <div class="col-md-offset-3">
-        <BsAlert @dismissible={{false}} class="opt-in" @type="warning">
-          The contacts entered may receive notifications about administration, webinars, product testing,
-          or news that will impact the use of DataCite services and/or membership. Individuals may remove
-          themselves from mailings by following the unsubscribe link provided in every DataCite email.
-          For information about our privacy practices and commitment to protecting your privacy, please
-          review our <a target="_blank" rel="noopener noreferrer" href={{get (links) "PRIVACY_POLICY_URL" }}>Privacy Policy</a>.
-        </BsAlert>
-      </div>
-
-      <div class="col-md-9 col-md-offset-3">
-        {{#if (is-empty (repository-form-errors this.model))}}
-          <button type="submit" id="update-repository" class="btn btn-sm btn-fill" disabled={{false}}>Update {{if (eq this.currentUser.uid this.model.id) 'Account' 'Repository'}}</button>
-        {{else}}
-          <BsAlert @dismissible={{false}} @type="danger">
-            To save this repository, first resolve the errors with these fields: {{repository-form-errors this.model}}.
-          </BsAlert>
-
-          <button type="submit" id="update-repository" class="btn btn-sm btn-fill" disabled={{true}}>Update {{if (eq this.currentUser.uid this.model.id) 'Account' 'Repository'}}</button>
-        {{/if}}
-
-        <button class="btn btn-sm" type="button" {{action "cancelAction" this.model}}>Cancel</button>
-      </div>
-    </BsForm>
-  </div>
-</div>
+<div class="panel panel-transparent" id="content-member">
+  <div class="panel-body">
+    <div class="col-md-9 col-md-offset-3"><h3 class="edit">Update {{if (eq this.currentUser.uid this.model.id) 'Account' 'Repository'}}</h3>
+      {{#each this.flashMessages.queue as |flash|}}
+        <FlashMessage @flash={{flash}} />
+      {{/each}}
+    </div>
+
+    <BsForm @formLayout="horizontal" class="form-horizontal" @horizontalLabelGridClass="col-md-3" @model={{this.model}} @onSubmit={{action "submitAction" this.model}} @submitOnEnter={{true}} as |form|>
+      <form.element @controlType="text" id="repository-id" class="form-group" @label="Repository ID" @property="symbol" @helpText="The Repository ID is the unique identifier for each repository in DataCite and can't be changed." as |el| >
+        <el.control disabled={{true}} />
+      </form.element>
+      <form.element @controlType="power-select" id="client-type" class="form-group" @label="Type" @value={{this.clientType}} @options={{this.clientTypes}} @optionLabelPath="label" as |el|>
+        <el.control @onChange={{action "selectClientTypeAction"}} @search={{action "searchClientTypeAction"}} @placeholder="Select Client Type" @searchPlaceholder="Type to search..." @disabled={{if (eq this.model.clientType "igsnCatalog") true false}} @searchEnabled={{true}}/>
+        {{#if (eq this.model.clientType "igsnCatalog")}}
+          <BsTooltip @renderInPlace={{true}} @placement="top" @viewportPadding={{10}}>IGSN ID Catalogs cannot be edited.</BsTooltip>
+        {{/if}}
+      </form.element>
+
+      {{#if (can "create provider")}}
+        <form.element @controlType="text" id="salesforce-id" class="form-group" @label="Salesforce ID" @property="salesforceId" @helpText="The 18 digit ID in Salesforce." />
+        <form.element @controlType="text" id="analytics-tracking-id" class="form-group" @label="Analytics Tracking ID (optional)" @property="analyticsTrackingId" @helpText="The Analytics Tracking ID used to generate usage reports." />
+      {{/if}}
+
+      {{#if (can "token provider")}}
+        <form.element @controlType="text" id="globus-uuid" class="form-group" @label="Globus UUID (optional)" @property="globusUuid" @helpText="The Globus UUID used for token authentication." />
+      {{/if}}
+
+      {{#if (eq this.model.clientType "periodical")}}
+        <RepositoryIssn @model={{this.model}} @fragment={{this.model.issn}} @form={{form}} />
+      {{else}}
+        <form.element @controlType="power-select" id="re3data" class="form-group" @property="re3data" @label="re3data Record (optional)" @optionLabelPath="re3data" @options={{this.repositories}} @destination={{this.re3data}} @helpText="re3data is a registry of research data repositories." as |el|>
+          <el.control @onChange={{action "selectRe3DataAction"}} @search={{action "searchRe3DataAction"}} @searchField="repositoryName" @searchPlaceholder="Type to search..." @allowClear={{true}} @searchEnabled={{true}} as |item|>
+            {{if item.name item.name this.model.re3data}}
+          </el.control>
+        </form.element>
+      {{/if}}
+
+      <form.element @controlType="text" id="name" class="form-group" @label="Repository Name" @property="name" as |el| ><el.control id="name-field" /></form.element>
+      <form.element @controlType="text" id="alternate-name" class="form-group" @label="Repository Alternate Name (optional)" @property="alternateName" />
+      <form.element @controlType="email" id="system-email" class="form-group" @label="System Email" @property="systemEmail" @helpText="This is the email used for sending password reset requests and similar system notifications." />
+
+      <div class="form-group">
+        <label class="control-label col-md-3">Service Contact (optional)</label>
+        <div class="col-md-9">
+          <div>
+            <label for="givenName" class="subtitle">Given Name (optional)</label>
+            <Input @type="text" class="form-control" id="service-contact-given-name" @value={{this.model.serviceContact.givenName}} required={{false}} />
+          </div>
+          <div>
+            <label for="familyName" class="subtitle">Family Name (optional)</label>
+            <Input @type="text" class="form-control" id="service-contact-family-name" @value={{this.model.serviceContact.familyName}} required={{false}} />
+          </div>
+          <div class="{{if (v-get this.model.serviceContact 'isInvalid') 'has-error has-feedback'}}">
+            <label for="email" class="subtitle control-label">Email (optional)</label>
+            <Input @type="text" class="form-control" id="service-contact-email" @value={{this.model.serviceContact.email}} required={{false}} />
+            {{#if (v-get this.model.serviceContact 'isInvalid')}}
+              <div class="help-block help-block-fragment" data-test-service-contact-email-help>{{v-get this.model.serviceContact 'message'}}</div>
+            {{/if}}
+          </div>
+        </div>
+      </div>
+
+      <form.element @controlType="textarea" id="description" class="form-group" @label="Description (optional)" @property="description" @helpText="Description of the repository. Please use markdown for formatting." as |el| ><el.control rows="10" /></form.element>
+      <form.element @controlType="text" id="url" class="form-group" @label="URL (optional)" @property="url" @helpText="The homepage of the repository." />
+
+      <div class="form-group" id="language">
+        <label class="control-label col-md-3">Language (optional)</label>
+        <div class="col-md-9">
+          {{#if (gt this.model.language.length 0)}}
+            {{#each this.model.language as |language index|}}
+              <RepositoryLanguage @model={{this.model}} @language={{language}} @form={{form}} @index={{index}} />
+            {{/each}}
+          {{/if}}
+          {{#if (lte this.model.language.length 2)}}
+            <BsButton class="btn-sm add-language" @outline={{true}} @onClick={{action "addLanguageAction"}}><i class="fas fa-plus-circle"></i> Add Language</BsButton>
+          {{/if}}
+        </div>
+      </div>
+
+      <form.element @controlType="power-select" id="software" class="form-group required-label {{if (and this.isSoftwareFieldActive (v-get this.model 'software' 'isInvalid')) 'has-error'}}" @label="Software"  @property="software" @options={{this.softwares}} @destination={{this.software}} @helpText="The name of the software that is used to run the repository. Select 'Other' if your repository software is not listed." as |el|>
+        <el.control {{on "click" this.activateSoftwareField}} @onChange={{action "selectSoftwareAction"}} @search={{action "searchSoftwareAction"}} @placeholder="Select Software" @searchPlaceholder="Type to search..." @allowClear={{true}} @searchEnabled={{true}} as |item|>
+          {{item}}
+        </el.control>
+      </form.element>
+      <form.element @controlType="textarea" id="domains" class="form-group" @label="Domains" @property="domains">
+        <Input @type="textarea" class="form-control" @value={{this.model.domains}} />
+        <div class="form-text">
+          <div>Define which domains or subdomains can be used for DOI URLs in the repository.</div>
+          <div>Use <code>*</code> to allow all domains, specify an exact domain (e.g., <code>example.org</code> or <code>www.example.org</code>), or use <code>*.</code> before a domain to allow only its subdomains (e.g., <code>*.example.org</code>). You can also separate multiple entries with commas (e.g., <code>example.org,*.example.org,www.secondexample.org</code>). <a href="https://support.datacite.org/docs/update-repository-settings#domains" target="_blank" rel="noopener noreferrer">Learn more...</a></div>
+        </div>
+      </form.element>
+
+      {{#unless (eq this.model.clientType "periodical")}}
+        <div class="form-group" id="repository-type">
+          <label class="control-label col-md-3">Repository Type (optional)</label>
+          <div class="col-md-9">
+            {{#if (gt this.model.repositoryType.length 0)}}
+              {{#each this.model.repositoryType as |repositoryType index|}}
+                <RepositoryRepositoryType @model={{this.model}} @repositoryType={{repositoryType}} @form={{form}} @index={{index}} />
+              {{/each}}
+            {{/if}}
+            {{#if (lte this.model.repositoryType.length 2)}}
+              <BsButton class="btn-sm add-repositoryType" @outline={{true}} @onClick={{action "addRepositoryTypeAction"}}><i class="fas fa-plus-circle"></i> Add Repository Type</BsButton>
+            {{/if}}
+          </div>
+        </div>
+
+
+        {{#if this.model.isDisciplinary }}
+        <RepositorySubjects @model={{this.model}} @form={{form}} />
+        {{/if}}
+
+        <div class="form-group" id="certificate">
+          <label class="control-label col-md-3">Certificate (optional)</label>
+          <div class="col-md-9">
+            {{#if (gt this.model.certificate.length 0)}}
+              {{#each this.model.certificate as |certificate index|}}
+                <RepositoryCertificate @model={{this.model}} @certificate={{certificate}} @form={{form}} @index={{index}} />
+              {{/each}}
+            {{/if}}
+            {{#if (lte this.model.certificate.length 2)}}
+              <BsButton class="btn-sm add-certificate" @outline={{true}} @onClick={{action "addCertificateAction"}}><i class="fas fa-plus-circle"></i> Add Certificate</BsButton>
+            {{/if}}
+          </div>
+        </div>
+      {{/unless}}
+
+      {{#if (can "create repository" this.model)}}
+        <form.element @controlType="checkbox" id="is-active" class="form-group" @label="Account is active" @property="isActive" @helpText="This account can register and update DOIs" as |el| >
+          <el.control id="is-active-field" />
+        </form.element>
+      {{/if}}
+
+      <div class="col-md-offset-3">
+        <BsAlert @dismissible={{false}} class="opt-in" @type="warning">
+          The contacts entered may receive notifications about administration, webinars, product testing,
+          or news that will impact the use of DataCite services and/or membership. Individuals may remove
+          themselves from mailings by following the unsubscribe link provided in every DataCite email.
+          For information about our privacy practices and commitment to protecting your privacy, please
+          review our <a target="_blank" rel="noopener noreferrer" href={{get (links) "PRIVACY_POLICY_URL" }}>Privacy Policy</a>.
+        </BsAlert>
+      </div>
+
+      <div class="col-md-9 col-md-offset-3">
+        {{#if (is-empty (repository-form-errors this.model))}}
+          <button type="submit" id="update-repository" class="btn btn-sm btn-fill" disabled={{false}}>Update {{if (eq this.currentUser.uid this.model.id) 'Account' 'Repository'}}</button>
+        {{else}}
+          <BsAlert @dismissible={{false}} @type="danger">
+            To save this repository, first resolve the errors with these fields: {{repository-form-errors this.model}}.
+          </BsAlert>
+
+          <button type="submit" id="update-repository" class="btn btn-sm btn-fill" disabled={{true}}>Update {{if (eq this.currentUser.uid this.model.id) 'Account' 'Repository'}}</button>
+        {{/if}}
+
+        <button class="btn btn-sm" type="button" {{action "cancelAction" this.model}}>Cancel</button>
+      </div>
+    </BsForm>
+  </div>
+</div>
diff --git a/tests/integration/helpers/repository-form-errors-test.js b/tests/integration/helpers/repository-form-errors-test.js
index 5ae45606d..7a8ef4abc 100644
--- a/tests/integration/helpers/repository-form-errors-test.js
+++ b/tests/integration/helpers/repository-form-errors-test.js
@@ -13,6 +13,6 @@ module('Integration | Helper | repository-form-errors', function (hooks) {
 
     await render(hbs`{{repository-form-errors this.model}}`);
 
-    assert.dom(this.element).hasText('repository ID, confirm repository ID');
+    assert.dom(this.element).hasText('repository ID, confirm repository ID, software');
   });
 });