diff --git a/views/profile_editor/edit_software_community.html.erb b/views/profile_editor/edit_software_community.html.erb
index 78627aa..86ec658 100644
--- a/views/profile_editor/edit_software_community.html.erb
+++ b/views/profile_editor/edit_software_community.html.erb
@@ -1,3 +1,4 @@
+
 <%= render :partial => 'first_edit_software_community_extras', :locals => {:class_step_one => "another-step", :class_step_two => "current-step"} if @first_edit %>
 
 <h1><%= _('Configure Software Community') %></h1>
@@ -66,19 +67,20 @@
 
   <% button_bar do %>
     <%= submit_button('save', _('Save'), :cancel => {:action => 'index'}) %>
-    <%= button(:back, _('Back to control panel'), :controller => 'profile_editor') %>
+
+    <% unless @first_edit %>
+      <%= button(:back, _('Back to control panel'), :controller => 'profile_editor') %>
+    <% end %>
   <% end %>
 
-  <% if user && user.has_permission?('destroy_profile', profile) %>
+  <% if user && user.has_permission?('destroy_profile', profile) && !@first_edit %>
     <% button_bar(:id => 'delete-profile') do %>
-      <%= button(:remove, _('Delete profile'), {:action => :destroy_profile}) %>
-
+      <%= button(:remove, _('Delete software and community'), {:action => :destroy_profile}) %>
       <% if environment.admins.include?(current_person) %>
-
         <% if profile.visible? %>
-          <%= button(:remove, _('Deactivate profile'), {:action => :deactivate_profile, :id=>profile.id}, :id=>'deactivate_profile_button', :data => {:confirm=>_("Are you sure you want to deactivate this profile?")}) %>
+          <%= button(:remove, _('Deactivate software and community'), {:action => :deactivate_profile, :id=>profile.id}, :id=>'deactivate_profile_button', :data => {:confirm=>_("Are you sure you want to deactivate this profile?")}) %>
         <% else %>
-          <%= button(:add, _('Activate profile'), {:action => :activate_profile, :id=>profile.id}, :data => {:confirm=>_("Are you sure you want to deactivate this profile?")}) %>
+          <%= button(:add, _('Activate software and community'), {:action => :activate_profile, :id=>profile.id}, :data => {:confirm=>_("Are you sure you want to deactivate this profile?")}) %>
         <% end %>
       <% end %>
     <% end %>
--
libgit2 0.21.2