diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/App_LocalResources/WebsitesSSL.ascx.resx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/App_LocalResources/WebsitesSSL.ascx.resx
index d533240d..d2bb349a 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/App_LocalResources/WebsitesSSL.ascx.resx
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/App_LocalResources/WebsitesSSL.ascx.resx
@@ -265,4 +265,7 @@
   <data name="valtxtPFXPassConfirm.ErrorMessage" xml:space="preserve">
     <value>Passwords do not match</value>
   </data>
+  <data name="SelectCertType.Text" xml:space="preserve">
+    <value>Select Certificate Type:</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/WebSitesEditSite.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/WebSitesEditSite.ascx
index 50177473..3af4a279 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/WebSitesEditSite.ascx
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/WebSitesEditSite.ascx
@@ -1,26 +1,17 @@
 <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="WebSitesEditSite.ascx.cs"
 	Inherits="WebsitePanel.Portal.WebSitesEditSite" %>
 <%@ Import Namespace="WebsitePanel.Portal" %>
-<%@ Register Src="WebSitesExtensionsControl.ascx" TagName="WebSitesExtensionsControl"
-	TagPrefix="uc6" %>
-<%@ Register Src="WebSitesCustomErrorsControl.ascx" TagName="WebSitesCustomErrorsControl"
-	TagPrefix="uc4" %>
-<%@ Register Src="WebSitesMimeTypesControl.ascx" TagName="WebSitesMimeTypesControl"
-	TagPrefix="uc5" %>
-<%@ Register Src="WebSitesHomeFolderControl.ascx" TagName="WebSitesHomeFolderControl"
-	TagPrefix="uc1" %>
-<%@ Register Src="WebSitesCustomHeadersControl.ascx" TagName="WebSitesCustomHeadersControl"
-	TagPrefix="uc6" %>
-<%@ Register Src="WebSitesSecuredFoldersControl.ascx" TagName="WebSitesSecuredFoldersControl"
-	TagPrefix="wsp" %>
-<%@ Register Src="WebSitesHeliconApeControl.ascx" TagName="WebSitesHeliconApeControl"
-	TagPrefix="wsp" %>
+<%@ Register Src="WebSitesExtensionsControl.ascx" TagName="WebSitesExtensionsControl"	TagPrefix="uc6" %>
+<%@ Register Src="WebSitesCustomErrorsControl.ascx" TagName="WebSitesCustomErrorsControl"	TagPrefix="uc4" %>
+<%@ Register Src="WebSitesMimeTypesControl.ascx" TagName="WebSitesMimeTypesControl"	TagPrefix="uc5" %>
+<%@ Register Src="WebSitesHomeFolderControl.ascx" TagName="WebSitesHomeFolderControl"	TagPrefix="uc1" %>
+<%@ Register Src="WebSitesCustomHeadersControl.ascx" TagName="WebSitesCustomHeadersControl"	TagPrefix="uc6" %>
+<%@ Register Src="WebSitesSecuredFoldersControl.ascx" TagName="WebSitesSecuredFoldersControl"	TagPrefix="wsp" %>
+<%@ Register Src="WebSitesHeliconApeControl.ascx" TagName="WebSitesHeliconApeControl"	TagPrefix="wsp" %>
 <%@ Register Src="UserControls/PasswordControl.ascx" TagName="PasswordControl" TagPrefix="wsp" %>
 <%@ Register Src="UserControls/UsernameControl.ascx" TagName="UsernameControl" TagPrefix="wsp" %>
-<%@ Register Src="UserControls/EnableAsyncTasksSupport.ascx" TagName="EnableAsyncTasksSupport"
-	TagPrefix="wsp" %>
-<%@ Register Src="UserControls/SimpleMessageBox.ascx" TagName="SimpleMessageBox"
-	TagPrefix="wsp" %>
+<%@ Register Src="UserControls/EnableAsyncTasksSupport.ascx" TagName="EnableAsyncTasksSupport"	TagPrefix="wsp" %>
+<%@ Register Src="UserControls/SimpleMessageBox.ascx" TagName="SimpleMessageBox"	TagPrefix="wsp" %>
 <%@ Register Src="UserControls/PopupHeader.ascx" TagName="PopupHeader" TagPrefix="wsp" %>
 <%@ Register TagPrefix="wsp" Namespace="WebsitePanel.Portal" %>
 <%@ Register Src="WebsitesSSL.ascx" TagName="WebsitesSSL" TagPrefix="uc2" %>
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/WebSitesEditSite.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/WebSitesEditSite.ascx.cs
index 5a5ba76e..d3ac61b0 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/WebSitesEditSite.ascx.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/WebSitesEditSite.ascx.cs
@@ -133,7 +133,7 @@ namespace WebsitePanel.Portal
 				else
 				{
 					// Select "Home Folder" tab by default
-					dlTabs.SelectedIndex = 0;
+                    dlTabs.SelectedIndex = 0;
 				}
 			}
 
@@ -1042,6 +1042,9 @@ namespace WebsitePanel.Portal
                 }
 
                 ShowSuccessMessage("WEB_SWITCH_TO_SHARED_IP");
+
+                dlTabs.SelectedIndex = 0;
+
             }
             catch (Exception ex)
             {
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/WebsitesSSL.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/WebsitesSSL.ascx
index 3e8e082c..93b38d0f 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/WebsitesSSL.ascx
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/WebsitesSSL.ascx
@@ -148,13 +148,16 @@
 				<h2>
 					<asp:Localize runat="server" meta:resourcekey="GenerateCSR" /></h2>
 				<table style="width: 100%;">
-					<tr>
+	                <tr>
 						<td class="SubHead">
-							<asp:Localize ID="sslDomain" runat="server" meta:resourcekey="sslDomain" /></td>
-						<td class="Normal">
-							<asp:DropDownList ID="lstDomains" runat="server" />
-							<asp:CheckBox ID="chkWild" runat="server" meta:resourcekey="sslWildcard" /></td>
-					</tr>
+							<asp:Localize ID="SelectCertType" runat="server" meta:resourcekey="SelectCertType" /></td>
+		                <td class="NormalBold" ><asp:radiobutton id="rbSiteCertificate" GroupName="Content" Runat="server" Checked="True"></asp:radiobutton></td>
+	                </tr>
+	                <tr>
+                        <td></td>
+                        <td class="NormalBold" ><asp:radiobutton id="rbDomainCertificate" GroupName="Content" Runat="server" ></asp:radiobutton></td>
+	                </tr>
+
 					<tr>
 						<td class="SubHead">
 							<asp:Localize ID="sslBitLength" runat="server" meta:resourcekey="sslBitLength" /></td>
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/WebsitesSSL.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/WebsitesSSL.ascx.cs
index dcd9189b..e43f1316 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/WebsitesSSL.ascx.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/WebsitesSSL.ascx.cs
@@ -109,9 +109,8 @@ namespace WebsitePanel.Portal
 
         private void BindListOfAvailableSslDomains(string websiteName, string domainName)
 		{
-            lstDomains.Items.Clear();
-            lstDomains.Items.Add(new ListItem(websiteName, websiteName));
-            lstDomains.Items.Add(new ListItem(domainName, domainName));
+            rbSiteCertificate.Text = websiteName;
+            rbDomainCertificate.Text = "*." + domainName;
 		}
 
 		public void BindWebItem(WebVirtualDirectory item)
@@ -237,25 +236,22 @@ namespace WebsitePanel.Portal
 
 		protected void btnCSR_Click(object sender, EventArgs e)
 		{
-			string domain = lstDomains.SelectedValue;
-			// Ensure wildcard certificate request is correct
-			if (chkWild.Checked)
-				domain = "*." + domain;
 			//
 			string distinguishedName = string.Format(@"CN={0},
                                                      O={1},
                                                      OU={2},                                                                                                  
                                                      L={3},
                                                      S={4},                                                
-                                                     C={5}", domain,
-															 txtCompany.Text,
-															 txtOU.Text,
-															 txtCity.Text,
-															 State,
-															 lstCountries.SelectedValue);
+                                                     C={5}",
+                                                    rbSiteCertificate.Checked ? rbSiteCertificate.Text : rbDomainCertificate.Text,
+														txtCompany.Text,
+														txtOU.Text,
+														txtCity.Text,
+														State,
+														lstCountries.SelectedValue);
 
 			SSLCertificate certificate = new SSLCertificate();
-			certificate.Hostname = domain;
+            certificate.Hostname = rbSiteCertificate.Checked ? rbSiteCertificate.Text : rbDomainCertificate.Text;
 			certificate.DistinguishedName = distinguishedName;
 			certificate.CSRLength = Convert.ToInt32(lstBits.SelectedValue);
 			certificate.Organisation = txtCompany.Text;
@@ -307,18 +303,12 @@ namespace WebsitePanel.Portal
 
 		protected void btnRenCSR_Click(object sender, EventArgs e)
 		{
-			//
-			string domain = lstDomains.SelectedValue;
-			//
-			if (chkWild.Checked)
-				domain = "*." + domain;
-			//
 			string distinguishedName = string.Format(@"CN={0},
                                                      O={1},
                                                      OU={2},                                                                                                  
                                                      L={3},
                                                      S={4},                                                
-                                                     C={5}", domain,
+                                                     C={5}", rbSiteCertificate.Checked ? rbSiteCertificate.Text : rbDomainCertificate.Text,
 															 txtCompany.Text,
 															 txtOU.Text,
 															 txtCity.Text,
@@ -326,7 +316,7 @@ namespace WebsitePanel.Portal
 															 lstCountries.SelectedValue);
 
 			SSLCertificate certificate = new SSLCertificate();
-			certificate.Hostname = domain;
+            certificate.Hostname = rbSiteCertificate.Checked ? rbSiteCertificate.Text : rbDomainCertificate.Text;
 			certificate.DistinguishedName = distinguishedName;
 			certificate.CSRLength = Convert.ToInt32(lstBits.SelectedValue);
 			certificate.Organisation = txtCompany.Text;
@@ -382,6 +372,8 @@ namespace WebsitePanel.Portal
 			pnlInstallCertificate.Visible = false;
 			SSLNotInstalled.Visible = true;
 			//
+            TabContainer1.ActiveTab = tabInstalled;
+
 			RefreshControlLayout(webSiteId);
 		}
 
@@ -508,12 +500,7 @@ namespace WebsitePanel.Portal
 			tabCSR.HeaderText = GetLocalizedString("SSLGenereateRenewal.HeaderText");
 
 			string hostname = cert.Hostname;
-			// Check if it is a wildcard certificate
-			if (!String.IsNullOrEmpty(cert.Hostname) && cert.Hostname.StartsWith("*"))
-			{
-				chkWild.Checked = true;
-				hostname = hostname.Remove(0, 2);
-			}
+
 			// Assign hostname
 			SetCertHostnameSelection(hostname);
 			// Assign state
@@ -653,14 +640,7 @@ namespace WebsitePanel.Portal
 
 		protected void SetCertHostnameSelection(string hostname)
 		{
-			//Bind new CSR with current certificate details
-			var li = lstDomains.Items.FindByValue(hostname);
-			// Select domain name from the existing certificate
-			if (li != null)
-			{
-				lstDomains.ClearSelection();
-				li.Selected = true;
-			}
+            rbSiteCertificate.Checked = (rbSiteCertificate.Text == hostname);
 		}
 
 		protected void SetCertCountrySelection(string country)
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/WebsitesSSL.ascx.designer.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/WebsitesSSL.ascx.designer.cs
index ed9eb37e..8243cd82 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/WebsitesSSL.ascx.designer.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/WebsitesSSL.ascx.designer.cs
@@ -337,31 +337,31 @@ namespace WebsitePanel.Portal {
         protected global::System.Web.UI.WebControls.Panel pnlCSR;
         
         /// <summary>
-        /// sslDomain control.
+        /// SelectCertType control.
         /// </summary>
         /// <remarks>
         /// Auto-generated field.
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
-        protected global::System.Web.UI.WebControls.Localize sslDomain;
+        protected global::System.Web.UI.WebControls.Localize SelectCertType;
         
         /// <summary>
-        /// lstDomains control.
+        /// rbSiteCertificate control.
         /// </summary>
         /// <remarks>
         /// Auto-generated field.
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
-        protected global::System.Web.UI.WebControls.DropDownList lstDomains;
+        protected global::System.Web.UI.WebControls.RadioButton rbSiteCertificate;
         
         /// <summary>
-        /// chkWild control.
+        /// rbDomainCertificate control.
         /// </summary>
         /// <remarks>
         /// Auto-generated field.
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
-        protected global::System.Web.UI.WebControls.CheckBox chkWild;
+        protected global::System.Web.UI.WebControls.RadioButton rbDomainCertificate;
         
         /// <summary>
         /// sslBitLength control.