diff --git a/journals/forms.py b/journals/forms.py
index ee50f2522245e2e98af619cb787c90047598e9f3..feb6323a7a8c8ab79ea4fcda10545d7e41a59b84 100644
--- a/journals/forms.py
+++ b/journals/forms.py
@@ -169,7 +169,6 @@ class CreateMetadataDOAJForm(forms.ModelForm):
                 'abstract': publication.abstract,
                 'year': publication.publication_date.strftime('%Y'),
                 'month': publication.publication_date.strftime('%m'),
-                'start_page': publication.get_paper_nr(),
                 'identifier': [
                     {
                         'type': 'eissn',
@@ -189,10 +188,11 @@ class CreateMetadataDOAJForm(forms.ModelForm):
             }
         }
         if publication.in_issue:
-            md['journal'] = {
+            md['bibjson']['journal'] = {
                 'publisher': 'SciPost',
                 'volume': str(publication.in_issue.in_volume.number),
                 'number': str(publication.in_issue.number),
+                'start_page': publication.get_paper_nr(),
                 'identifier': [{
                     'type': 'eissn',
                     'id': issn
@@ -210,8 +210,9 @@ class CreateMetadataDOAJForm(forms.ModelForm):
                 'title': publication.in_issue.in_volume.in_journal.get_name_display(),
             }
         else:
-            md['journal'] = {
+            md['bibjson']['journal'] = {
                 'publisher': 'SciPost',
+                'start_page': publication.get_paper_nr(),
                 'identifier': [{
                     'type': 'eissn',
                     'id': issn
diff --git a/journals/views.py b/journals/views.py
index 1e685ba0896105a87152f2eea0ba1bef51c67acb..3f5b16b7d3f59bc2c58bb633d80976d3e584dfde 100644
--- a/journals/views.py
+++ b/journals/views.py
@@ -587,9 +587,10 @@ def metadata_DOAJ_deposit(request, doi_label):
         return redirect(reverse('journals:manage_metadata',
                                 kwargs={'doi_label': doi_label}))
 
-    timestamp = publication.metadata_xml.partition('<timestamp>')[2].partition('</timestamp>')[0]
+    #timestamp = publication.metadata_xml.partition('<timestamp>')[2].partition('</timestamp>')[0]
+    timestamp = timezone.now().strftime('%Y%m%d%H%M%S')
 
-    # Find DOAJ xml files
+    # Find DOAJ json files
     path = ''
     if publication.in_issue:
         path += '{issue_path}/{paper_nr}/{doi_label}_DOAJ'.format(
@@ -871,6 +872,7 @@ def generic_metadata_xml_deposit(request, **kwargs):
 
     if not _object.doi_label:
         _object.create_doi_label()
+        _object.refresh_from_db()
 
     # create a doi_batch_id
     salt = ""