diff --git a/app/views/admin/settings/index.haml b/app/views/admin/settings/index.haml
index 94d0a2657..9c302cc53 100644
--- a/app/views/admin/settings/index.haml
+++ b/app/views/admin/settings/index.haml
@@ -50,6 +50,13 @@
           = render 'setting_row', var: :request_confirmation_on_domain_deletion_enabled
           = render 'setting_row', var: :address_processing
 
+          %tr
+            %td.col-md-6= label_tag :default_language
+            %td.col-md-6
+              = select_tag '[settings][default_language]',
+              options_for_select({ en: 'English', et: 'Estonian' }.invert, Setting.default_language),
+              class: 'form-control'
+
   .panel.panel-default
     .panel-heading
       = t('.billing')
diff --git a/config/initializers/initial_settings.rb b/config/initializers/initial_settings.rb
index 922d96bc9..94ff1dc7e 100644
--- a/config/initializers/initial_settings.rb
+++ b/config/initializers/initial_settings.rb
@@ -27,6 +27,7 @@ if con.present? && con.table_exists?('settings')
   Setting.save_default(:request_confrimation_on_registrant_change_enabled, true)
   Setting.save_default(:request_confirmation_on_domain_deletion_enabled, true)
   Setting.save_default(:address_processing, true)
+  Setting.save_default(:default_language, 'en')
   Setting.save_default(:nameserver_required, false)
 
   Setting.save_default(:client_side_status_editing_enabled, false)