diff --git a/lib/create_software.rb b/lib/create_software.rb
index 7b8b914..10117d5 100644
--- a/lib/create_software.rb
+++ b/lib/create_software.rb
@@ -5,12 +5,12 @@ class CreateSoftware < Task
   validates_presence_of :name
 
   attr_accessible :name, :finality, :repository_link, :requestor, :environment,
-                  :reject_explanation, :license_info
+                  :reject_explanation, :license_info, :identifier
 
   alias :environment :target
   alias :environment= :target=
 
-  DATA_FIELDS = ['name', 'finality', 'license_info', 'repository_link']
+  DATA_FIELDS = ['name', 'identifier', 'finality', 'license_info', 'repository_link']
   DATA_FIELDS.each do |field|
     settings_items field.to_sym
   end
@@ -21,7 +21,11 @@ class CreateSoftware < Task
       template_id = software_template.id
     end
 
+    identifier = self.identifier
+    identifier ||= self.name.to_slug
+
     community = Community.create!(:name => self.name,
+                                  :identifier => identifier,
                                   :template_id => template_id)
 
     community.environment = self.environment
diff --git a/lib/software_info.rb b/lib/software_info.rb
index 350696d..692634c 100644
--- a/lib/software_info.rb
+++ b/lib/software_info.rb
@@ -172,6 +172,7 @@ class SoftwareInfo < ActiveRecord::Base
           :requestor => requestor,
           :environment => environment,
           :name => name,
+          :identifier => identifier,
           :license_info => license_info
         )
       )
diff --git a/test/unit/software_info_validation_test.rb b/test/unit/software_info_validation_test.rb
index e42bf9b..b5324a6 100644
--- a/test/unit/software_info_validation_test.rb
+++ b/test/unit/software_info_validation_test.rb
@@ -49,6 +49,7 @@ class SoftwareInfoValidationTest < ActiveSupport::TestCase
 
     @software_info.features = "Do a lot of things"
     @software_info.objectives = "All tests should pass !"
+    @software_info.community = @community
   end
 
   def teardown
--
libgit2 0.21.2