diff --git a/db/migrate/20171123035941_change_registrar_language_to_not_null.rb b/db/migrate/20171123035941_change_registrar_language_to_not_null.rb
new file mode 100644
index 000000000..583e17bf4
--- /dev/null
+++ b/db/migrate/20171123035941_change_registrar_language_to_not_null.rb
@@ -0,0 +1,5 @@
+class ChangeRegistrarLanguageToNotNull < ActiveRecord::Migration
+  def change
+    change_column_null :registrars, :language, false, 'et'
+  end
+end
diff --git a/db/structure.sql b/db/structure.sql
index 2d219f3d0..30df2f3cf 100644
--- a/db/structure.sql
+++ b/db/structure.sql
@@ -2478,7 +2478,7 @@ CREATE TABLE registrars (
     legacy_id integer,
     reference_no character varying,
     test_registrar boolean DEFAULT false,
-    language character varying
+    language character varying NOT NULL
 );
 
 
@@ -5060,3 +5060,5 @@ INSERT INTO schema_migrations (version) VALUES ('20171025153841');
 
 INSERT INTO schema_migrations (version) VALUES ('20171121233843');
 
+INSERT INTO schema_migrations (version) VALUES ('20171123035941');
+