diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Icons/create_organization_48.png b/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Icons/create_organization_48.png
new file mode 100644
index 00000000..5c97b86f
Binary files /dev/null and b/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Icons/create_organization_48.png differ
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/App_LocalResources/UserOrganization.ascx.resx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/App_LocalResources/UserOrganization.ascx.resx
index faa19b08..9db2a02d 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/App_LocalResources/UserOrganization.ascx.resx
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/App_LocalResources/UserOrganization.ascx.resx
@@ -249,4 +249,7 @@
   <data name="Text.Users" xml:space="preserve">
     <value>Users</value>
   </data>
+  <data name="Text.CreateOrganization" xml:space="preserve">
+    <value>Create Organization</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserControls/OrganizationMenuControl.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserControls/OrganizationMenuControl.cs
index 5d01bb2a..4f537a5f 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserControls/OrganizationMenuControl.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserControls/OrganizationMenuControl.cs
@@ -74,6 +74,8 @@ namespace WebsitePanel.Portal.UserControls
 
         public void BindMenu(MenuItemCollection items)
         {
+            if ((PackageId <= 0) || (ItemID <= 0))
+                return;
 
             //Organization menu group;
             if (Cntx.Groups.ContainsKey(ResourceGroups.HostedOrganizations))
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserOrganization.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserOrganization.ascx.cs
index 4a72bd03..a487dda2 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserOrganization.ascx.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserOrganization.ascx.cs
@@ -106,13 +106,21 @@ namespace WebsitePanel.Portal
             ShowImg = true;
 
 
-            if (PackageId > 0)
+            if ((PackageId > 0) && (Cntx.Groups.ContainsKey(ResourceGroups.HostedOrganizations)))
             {
                 MenuItemCollection items = new MenuItemCollection();
 
-                items.Add(CreateMenuItem("OrganizationHome", "organization_home", @"Icons/organization_home_48.png"));
+                if (ItemID > 0)
+                {
+                    items.Add(CreateMenuItem("OrganizationHome", "organization_home", @"Icons/organization_home_48.png"));
+                    BindMenu(items);
+                }
+                else
+                {
+                    items.Add(CreateMenuItem("CreateOrganization", "create_organization", @"Icons/create_organization_48.png"));
+                }
+
 
-                BindMenu(items);
                 UserOrgPanel.Visible = true;
 
                 OrgIcons.DataSource = items;
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/WebsitePanel.WebPortal.csproj b/WebsitePanel/Sources/WebsitePanel.WebPortal/WebsitePanel.WebPortal.csproj
index 2ffe738a..a28a12e2 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/WebsitePanel.WebPortal.csproj
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/WebsitePanel.WebPortal.csproj
@@ -109,6 +109,7 @@
     <Content Include="App_Themes\Default\Icons\blackberry_users_48.png" />
     <Content Include="App_Themes\Default\Icons\block.png" />
     <Content Include="App_Themes\Default\Icons\configureVLan.png" />
+    <Content Include="App_Themes\Default\Icons\create_organization_48.png" />
     <Content Include="App_Themes\Default\Icons\crm_orgs_48.png" />
     <Content Include="App_Themes\Default\Icons\crm_users_48.png" />
     <Content Include="App_Themes\Default\Icons\domains_48.png" />