diff --git a/app/views/admin/site_panel/_sites_list_table.html.erb b/app/views/admin/site_panel/_sites_list_table.html.erb
index 916b505..499ae02 100644
--- a/app/views/admin/site_panel/_sites_list_table.html.erb
+++ b/app/views/admin/site_panel/_sites_list_table.html.erb
@@ -30,7 +30,7 @@
           <% if site.status.blank? %>
             <a href="#" title="create <%=site.domain_name%>" class="btn btn-primary create_site" data-id="<%=site.id.to_s%>"><%=t('client_management.create_site')%></a>
           <% elsif site.status == "error" || site.status == "finish" %>
-            <a href="#" title="recreate <%=site.domain_name%>" class="btn btn-primary create_site" data-id="<%=site.id.to_s%>"><%=t('client_management.recreate_site')%></a>
+            <a href="#" title="recreate <%=site.domain_name%>" class="btn btn-primary recreate_site" data-id="<%=site.id.to_s%>"><%=t('client_management.recreate_site')%></a>
             <a href="#" title="<%=t("client_management.delete_site_for_site",{:site=>site.domain_name})%>" class="btn btn-primary delete_site" data-id="<%=site.id.to_s%>"><%=t('client_management.delete_site')%></a>
             <a href="#" title="<%=t("client_management.close_site_for_site",{:site=>site.domain_name})%>" class="btn btn-primary close_site" data-id="<%=site.id.to_s%>"><%=t('client_management.close_site')%></a>
             <a href="#" title="Restart <%=site.domain_name%>" class="btn btn-primary open_site" data-id="<%=site.id.to_s%>"><%=t('client_management.restart_site')%></a>
@@ -159,6 +159,20 @@
         show_infos_dialog(item);
       })
     });
+    $('.recreate_site').click(function(){
+      if(window.confirm("Do you really want to recreate this site?")){
+        if(window.confirm("Do you really want to recreate this site?")){
+          close_info = true;
+          window.clearTimeout(timeout_id);
+          close_info = false;
+          var id = $(this).attr("data-id");
+          var item = this;
+          $.post("<%= admin_site_panel_create_site_path %>",{'id': id}).done(function(){
+            show_infos_dialog(item);
+          })
+        }
+      }
+    });
     $('.delete_site').click(function(){
       var item = this;
       if(window.confirm("Do you really want to delete this site?")){
@@ -248,7 +262,7 @@
       });
     }
     function exec_commands(){
-      var commands = $('#commands_area').val().replace("\r\n","////");
+      var commands = $('#commands_area').val().replace(/(\r\n|\n)/,"////");
       var id = $('#commands_area').attr('data-id');
       console.log(id);
       console.log(commands);
diff --git a/lib/tasks/exec_command.rake b/lib/tasks/exec_command.rake
index 7243d67..482cad5 100644
--- a/lib/tasks/exec_command.rake
+++ b/lib/tasks/exec_command.rake
@@ -73,7 +73,7 @@ namespace :exec_commands do
               update_infos_for_exec("finish starting #{@site_construct.site_name}")
               @site_construct.update(:status =>"finish")
             elsif args.type == 'exec_all'
-              sites = SiteConstruct.where(:server_type=>args.server_name).to_a
+              sites = SiteConstruct.where(:server_type=>site_server.server_name).to_a
               commands = args.commands.split("////").select{|c| c != ""} rescue [args.commands]
               sites.each do |site_construct|
                 @site_construct = site_construct