diff --git a/db/migrate/20170606202859_improve_contact_registrar_id.rb b/db/migrate/20170606202859_improve_contact_registrar_id.rb
new file mode 100644
index 000000000..fb5fc562e
--- /dev/null
+++ b/db/migrate/20170606202859_improve_contact_registrar_id.rb
@@ -0,0 +1,6 @@
+class ImproveContactRegistrarId < ActiveRecord::Migration
+  def change
+    add_foreign_key :contacts, :registrars, name: 'contacts_registrar_id_fk'
+    change_column :contacts, :registrar_id, :integer, null: false
+  end
+end
diff --git a/db/structure.sql b/db/structure.sql
index a6c0bc1c4..e01885fa8 100644
--- a/db/structure.sql
+++ b/db/structure.sql
@@ -693,7 +693,7 @@ CREATE TABLE contacts (
     auth_info character varying,
     name character varying,
     org_name character varying,
-    registrar_id integer,
+    registrar_id integer NOT NULL,
     creator_str character varying,
     updator_str character varying,
     ident_country_code character varying,
@@ -4646,6 +4646,14 @@ CREATE UNIQUE INDEX unique_data_migrations ON data_migrations USING btree (versi
 CREATE UNIQUE INDEX unique_schema_migrations ON schema_migrations USING btree (version);
 
 
+--
+-- Name: contacts_registrar_id_fk; Type: FK CONSTRAINT; Schema: public; Owner: -
+--
+
+ALTER TABLE ONLY contacts
+    ADD CONSTRAINT contacts_registrar_id_fk FOREIGN KEY (registrar_id) REFERENCES registrars(id);
+
+
 --
 -- Name: domains_registrant_id_fk; Type: FK CONSTRAINT; Schema: public; Owner: -
 --
@@ -5156,3 +5164,5 @@ INSERT INTO schema_migrations (version) VALUES ('20170606133501');
 
 INSERT INTO schema_migrations (version) VALUES ('20170606150352');
 
+INSERT INTO schema_migrations (version) VALUES ('20170606202859');
+