diff --git a/app/models/environment.rb b/app/models/environment.rb
index 3e2df32..190860f 100644
--- a/app/models/environment.rb
+++ b/app/models/environment.rb
@@ -769,6 +769,10 @@ class Environment < ActiveRecord::Base
 
   serialize :languages
 
+  before_validation do |environment|
+    environment.default_language = nil if environment.default_language.blank?
+  end
+
   validate :default_language_available
   validate :languages_available
 
diff --git a/app/views/admin_panel/_site_info.rhtml b/app/views/admin_panel/_site_info.rhtml
index 1506e74..8bc828c 100644
--- a/app/views/admin_panel/_site_info.rhtml
+++ b/app/views/admin_panel/_site_info.rhtml
@@ -1,3 +1,16 @@
 <%= required labelled_form_field(_('Site name'), text_field(:environment, :name)) %>
 <%= required f.text_field(:reports_lower_bound, :size => 3) %>
+<%= labelled_form_field(_('Default language'), select(:environment, :default_language, environment.locales.invert, { :selected => environment.default_locale, :include_blank => true })) %>
+<%= label_tag :languages, _('Available languages') %>
+<br />
+<% counter = 0 %>
+<table>
+<% Noosfero.locales.each do |value, name| %>
+  <%= "<tr>" if counter%3==0 %>
+  <% counter += 1 %>
+  <%= content_tag('td', labelled_check_box(name, "environment[languages][#{value}]", true, environment.available_locales.include?(value))) %>
+  <%= "</tr>" if counter%3==0 %>
+<% end %>
+</table>
+<br />
 <%= labelled_form_field _('Homepage content'), text_area(:environment, :description, :cols => 40, :style => 'width: 90%', :class => 'mceEditor') %>
--
libgit2 0.21.2