diff --git a/dspace/config/submission-forms.xml b/dspace/config/submission-forms.xml
index e50e1b58de4a..0946ead8b21e 100644
--- a/dspace/config/submission-forms.xml
+++ b/dspace/config/submission-forms.xml
@@ -66,8 +66,8 @@
             <row>
                 <field>
                     <dc-schema>dc</dc-schema>
-                    <dc-element>creator</dc-element>
-                    <dc-qualifier></dc-qualifier>
+                    <dc-element>contributor</dc-element>
+                    <dc-qualifier>author</dc-qualifier>
                     <repeatable>true</repeatable>
                     <label>Autor</label>
                     <input-type>name</input-type>
@@ -293,8 +293,8 @@
             <row>
                 <field>
                     <dc-schema>dc</dc-schema>
-                    <dc-element>creator</dc-element>
-                    <dc-qualifier></dc-qualifier>
+                    <dc-element>contributor</dc-element>
+                    <dc-qualifier>author</dc-qualifier>
                     <repeatable>true</repeatable>
                     <label>Autor</label>
                     <input-type>name</input-type>
@@ -1628,6 +1628,10 @@
         </value-pairs>
 
         <value-pairs value-pairs-name="common_identifiers" dc-term="identifier">
+            <pair>
+                <displayed-value>ISBN</displayed-value>
+                <stored-value>isbn</stored-value>
+            </pair>
             <pair>
                 <displayed-value>ISSN</displayed-value>
                 <stored-value>issn</stored-value>
@@ -1636,6 +1640,14 @@
                 <displayed-value>eISSN (online)</displayed-value>
                 <stored-value>eissn</stored-value>
             </pair>
+            <pair>
+                <displayed-value>DOI</displayed-value>
+                <stored-value>doi</stored-value>
+            </pair>
+            <pair>
+                <displayed-value>URI</displayed-value>
+                <stored-value>uri</stored-value>
+            </pair>
             <pair>
                 <displayed-value>Jiný</displayed-value>
                 <stored-value>other</stored-value>
@@ -1648,14 +1660,6 @@
                 <displayed-value>Gov't Doc #</displayed-value>
                 <stored-value>govdoc</stored-value>
             </pair>
-            <pair>
-                <displayed-value>URI</displayed-value>
-                <stored-value>uri</stored-value>
-            </pair>
-            <pair>
-                <displayed-value>ISBN</displayed-value>
-                <stored-value>isbn</stored-value>
-            </pair>
         </value-pairs>
 
         <value-pairs value-pairs-name="common_types" dc-term="type">