diff --git a/dspace/config/item-submission.xml b/dspace/config/item-submission.xml
index a6cd49bdf1e8..1454274e4689 100644
--- a/dspace/config/item-submission.xml
+++ b/dspace/config/item-submission.xml
@@ -57,7 +57,7 @@
             - - - - - -
             Uncomment if you intend to use them
         -->  
-        <!-- 
+
         <name-map collection-entity-type="Publication" submission-name="Publication"/>
         <name-map collection-entity-type="Person" submission-name="Person"/>
         <name-map collection-entity-type="Project" submission-name="Project"/>
@@ -65,7 +65,7 @@
         <name-map collection-entity-type="Journal" submission-name="Journal"/>
         <name-map collection-entity-type="JournalVolume" submission-name="JournalVolume"/>
         <name-map collection-entity-type="JournalIssue" submission-name="JournalIssue"/>
-         -->
+
 
     </submission-map>
 
diff --git a/dspace/config/modules/authentication.cfg b/dspace/config/modules/authentication.cfg
index 568f871e3cd7..b8de9d310469 100644
--- a/dspace/config/modules/authentication.cfg
+++ b/dspace/config/modules/authentication.cfg
@@ -53,7 +53,7 @@
 #plugin.sequence.org.dspace.authenticate.AuthenticationMethod = org.dspace.authenticate.X509Authentication
 
 # ORCID certificate authentication.
-# plugin.sequence.org.dspace.authenticate.AuthenticationMethod = org.dspace.authenticate.OrcidAuthentication
+ plugin.sequence.org.dspace.authenticate.AuthenticationMethod = org.dspace.authenticate.OrcidAuthentication
 
 # OIDC authentication. See authentication-oidc.cfg for default configuration.
 #plugin.sequence.org.dspace.authenticate.AuthenticationMethod = org.dspace.authenticate.OidcAuthentication
diff --git a/dspace/config/modules/authority.cfg b/dspace/config/modules/authority.cfg
index cd0f689e110a..89fe5b970df1 100644
--- a/dspace/config/modules/authority.cfg
+++ b/dspace/config/modules/authority.cfg
@@ -40,10 +40,10 @@ authority.minconfidence = ambiguous
 
 # Configuration settings for ORCID based authority control.
 # Uncomment the lines below to enable configuration
-#choices.plugin.dc.contributor.author = SolrAuthorAuthority
-#choices.presentation.dc.contributor.author = authorLookup
-#authority.controlled.dc.contributor.author = true
-#authority.author.indexer.field.1=dc.contributor.author
+choices.plugin.dc.contributor.author = SolrAuthorAuthority
+choices.presentation.dc.contributor.author = authorLookup
+authority.controlled.dc.contributor.author = true
+authority.author.indexer.field.1=dc.contributor.author
 
 ##
 ## This sets the lowest confidence level at which a metadata value is included
@@ -75,8 +75,8 @@ authority.minconfidence = ambiguous
 # org.dspace.content.authority.SolrAuthority = SolrAuthorAuthority
 
 #Uncomment to enable ORCID authority control
-#plugin.named.org.dspace.content.authority.ChoiceAuthority = \
-# org.dspace.content.authority.SolrAuthority = SolrAuthorAuthority
+plugin.named.org.dspace.content.authority.ChoiceAuthority = \
+ org.dspace.content.authority.SolrAuthority = SolrAuthorAuthority
 
 plugin.named.org.dspace.content.authority.ChoiceAuthority = \
 org.dspace.content.authority.EPersonAuthority = EPersonAuthority
@@ -84,5 +84,5 @@ org.dspace.content.authority.EPersonAuthority = EPersonAuthority
 # Configuration settings required for Researcher Profiles
 # These settings ensure "dspace.object.owner" field are indexed by Authority Control
 #choices.plugin.dspace.object.owner = EPersonAuthority
-#choices.presentation.dspace.object.owner = suggest
-#authority.controlled.dspace.object.owner = true
+choices.presentation.dspace.object.owner = suggest
+authority.controlled.dspace.object.owner = true
diff --git a/dspace/config/spring/api/orcid-authority-services.xml b/dspace/config/spring/api/orcid-authority-services.xml
index c641b1cf88fb..427f2826f95c 100644
--- a/dspace/config/spring/api/orcid-authority-services.xml
+++ b/dspace/config/spring/api/orcid-authority-services.xml
@@ -15,7 +15,6 @@
 
     <bean id="dspace.DSpaceAuthorityIndexer" class="org.dspace.authority.indexer.DSpaceAuthorityIndexer"/>
 
-<!--
     <alias name="OrcidSource" alias="AuthoritySource"/>
     <bean name="OrcidSource" class="org.dspace.authority.orcid.Orcidv3SolrAuthorityImpl">
         <property name="clientId" value="${orcid.application-client-id}" />
@@ -23,12 +22,10 @@
         <property name="OAUTHUrl" value="${orcid.token-url}" />
         <property name="orcidRestConnector" ref="orcidRestConnector"/>
     </bean>
- -->
  
     <bean name="AuthorityTypes" class="org.dspace.authority.AuthorityTypes">
         <property name="types">
             <list>
-                <!-- <bean class="org.dspace.authority.orcid.Orcidv3AuthorityValue"/> -->
                 <bean class="org.dspace.authority.PersonAuthorityValue"/>
             </list>
         </property>