diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1b1f4d62..481ff340 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@ All notable changes to this project will be documented in this file.
 * Add Portuguese as an admin language
 * Add preset color palettes
 * Require Rails 5.1.0 or above
+* Fix issue with seeding content (#38)
 
 ## 1.2.0 / 2017-08-23
 
diff --git a/app/models/pwb/contact.rb b/app/models/pwb/contact.rb
index fa75f18c..e9b73fdb 100644
--- a/app/models/pwb/contact.rb
+++ b/app/models/pwb/contact.rb
@@ -3,7 +3,7 @@ class Contact < ApplicationRecord
     has_many :messages
     belongs_to :primary_address, optional: true, class_name: "Address", foreign_key: 'primary_address_id'
     belongs_to :secondary_address, optional: true, class_name: "Address", foreign_key: 'secondary_address_id'
-    belongs_to :user
+    belongs_to :user, optional: true
 
     # enum title: [ :mr, :mrs ]
     # above method of declaring less flexible than below:
diff --git a/app/models/pwb/link.rb b/app/models/pwb/link.rb
index 3c8ad4ca..9e8ef280 100644
--- a/app/models/pwb/link.rb
+++ b/app/models/pwb/link.rb
@@ -5,7 +5,7 @@ class Link < ApplicationRecord
     # globalize_accessors locales: [:en, :ca, :es, :fr, :ar, :de, :ru, :pt]
     globalize_accessors locales: I18n.available_locales
 
-    belongs_to :page, foreign_key: "page_slug", primary_key: "slug"
+    belongs_to :page, optional: true, foreign_key: "page_slug", primary_key: "slug"
 
     # below needed to avoid "... is not an attribute known to Active Record" warnings
     attribute :link_title