diff --git a/plugins/mezuro/lib/mezuro_plugin/configuration_content.rb b/plugins/mezuro/lib/mezuro_plugin/configuration_content.rb
index d085d99..f7b52e0 100644
--- a/plugins/mezuro/lib/mezuro_plugin/configuration_content.rb
+++ b/plugins/mezuro/lib/mezuro_plugin/configuration_content.rb
@@ -43,7 +43,6 @@ class MezuroPlugin::ConfigurationContent < Article
     rescue Exception => exception
       errors.add_to_base(exception.message)
     end
-    all_names_and_ids[-1] = "None"
     all_names_and_ids
   end
 
diff --git a/plugins/mezuro/views/cms/mezuro_plugin/_configuration_content.html.erb b/plugins/mezuro/views/cms/mezuro_plugin/_configuration_content.html.erb
index 8c1c449..ad8e98a 100644
--- a/plugins/mezuro/views/cms/mezuro_plugin/_configuration_content.html.erb
+++ b/plugins/mezuro/views/cms/mezuro_plugin/_configuration_content.html.erb
@@ -2,7 +2,7 @@
 
 <%
   kalibro_configuration = @article.title.nil? ? nil : @article.kalibro_configuration
-  kalibro_configuration_names = @article.configuration_names_and_ids.values
+  kalibro_configuration_names = ["None"] + @article.configuration_names_and_ids.values.sort
 %>
 
 <%= error_messages_for 'kalibro_configuration' %>
@@ -14,12 +14,13 @@
 
 <%= required_fields_message %>
 
+<%= required f.text_field(:name) %>
+
+<%= f.text_field :description %><br/>
+
 <%= if kalibro_configuration.nil?
   required labelled_form_field _('Clone Configuration'),
   f.select(:configuration_to_clone_name, kalibro_configuration_names)
 end %>
 <br/>
 
-<%= required f.text_field(:name) %>
-
-<%= f.text_field :description %><br/>
--
libgit2 0.21.2