diff --git a/app/controllers/admin/site_panel_controller.rb b/app/controllers/admin/site_panel_controller.rb
index 2d28162..219aac3 100644
--- a/app/controllers/admin/site_panel_controller.rb
+++ b/app/controllers/admin/site_panel_controller.rb
@@ -31,7 +31,7 @@ class Admin::SitePanelController < OrbitAdminController
     domain_names = domain_name.split(" ").select{|s| s.present?}
     domain_names_count = domain_names.count
     (0...domain_names_count).each do |i|
-      domain_names << domain_names[i].sub(/\w+\./,'\\*.')
+      domain_names << domain_names[i].sub(/[^\.]+\./,'\\*.')
     end
     if domain_names.count != 0
       domain_name_search_text = "(" + domain_names.join("|") + ")"
diff --git a/app/views/admin/site_panel/get_certs_for_site.html.erb b/app/views/admin/site_panel/get_certs_for_site.html.erb
index 1911985..680f193 100644
--- a/app/views/admin/site_panel/get_certs_for_site.html.erb
+++ b/app/views/admin/site_panel/get_certs_for_site.html.erb
@@ -43,12 +43,14 @@
       		<th><%=t('client_management.domain_name')%></th>
 		</thead>
 		<tbody>
+			<% if (site_server.has_certbot rescue false)%>
 			<tr>
 				<td><%=radio_button_tag("site_cert","certbot",false)%></td>
 				<td>Certbot</td>
 				<td></td>
     			<td></td>
 			</tr>
+			<% end %>
 			<% @site_certs.each do |site_cert| %>
 				<tr>
 					<td><%=radio_button_tag("site_cert",site_cert.id,site_cert.id == @enable_cert_id)%></td>