diff --git a/WebsitePanel/Database/install_db.sql b/WebsitePanel/Database/install_db.sql
index ce2eec74..e6409576 100644
--- a/WebsitePanel/Database/install_db.sql
+++ b/WebsitePanel/Database/install_db.sql
@@ -44770,6 +44770,11 @@ CREATE PROCEDURE [dbo].[AddExchangeMailboxPlan]
 )
 AS
 
+IF ((SELECT Count(*) FROM ExchangeMailboxPlans WHERE ItemId = @ItemID) = 0)
+BEGIN
+	SET @IsDefault = 1
+END
+
 INSERT INTO ExchangeMailboxPlans
 (
 	ItemID,
@@ -45038,6 +45043,12 @@ CREATE PROCEDURE [dbo].[AddLyncUserPlan]
 )
 AS
 
+IF ((SELECT Count(*) FROM LyncUserPlans WHERE ItemId = @ItemID) = 0)
+BEGIN
+	SET @IsDefault = 1
+END
+
+
 INSERT INTO LyncUserPlans
 (
 	ItemID,
diff --git a/WebsitePanel/Database/update_db.sql b/WebsitePanel/Database/update_db.sql
index be2d9848..d3d09146 100644
--- a/WebsitePanel/Database/update_db.sql
+++ b/WebsitePanel/Database/update_db.sql
@@ -1931,6 +1931,11 @@ CREATE PROCEDURE [dbo].[AddExchangeMailboxPlan]
 )
 AS
 
+IF ((SELECT Count(*) FROM ExchangeMailboxPlans WHERE ItemId = @ItemID) = 0)
+BEGIN
+	SET @IsDefault = 1
+END
+
 INSERT INTO ExchangeMailboxPlans
 (
 	ItemID,
@@ -1983,6 +1988,83 @@ GO
 
 
 
+ALTER PROCEDURE [dbo].[AddExchangeMailboxPlan] 
+(
+	@MailboxPlanId int OUTPUT,
+	@ItemID int,
+	@MailboxPlan	nvarchar(300),
+	@EnableActiveSync bit,
+	@EnableIMAP bit,
+	@EnableMAPI bit,
+	@EnableOWA bit,
+	@EnablePOP bit,
+	@IsDefault bit,
+	@IssueWarningPct int,
+	@KeepDeletedItemsDays int,
+	@MailboxSizeMB int,
+	@MaxReceiveMessageSizeKB int,
+	@MaxRecipients int,
+	@MaxSendMessageSizeKB int,
+	@ProhibitSendPct int,
+	@ProhibitSendReceivePct int	,
+	@HideFromAddressBook bit
+)
+AS
+
+IF ((SELECT Count(*) FROM ExchangeMailboxPlans WHERE ItemId = @ItemID) = 0)
+BEGIN
+	SET @IsDefault = 1
+END
+
+INSERT INTO ExchangeMailboxPlans
+(
+	ItemID,
+	MailboxPlan,
+	EnableActiveSync,
+	EnableIMAP,
+	EnableMAPI,
+	EnableOWA,
+	EnablePOP,
+	IsDefault,
+	IssueWarningPct,
+	KeepDeletedItemsDays,
+	MailboxSizeMB,
+	MaxReceiveMessageSizeKB,
+	MaxRecipients,
+	MaxSendMessageSizeKB,
+	ProhibitSendPct,
+	ProhibitSendReceivePct,
+	HideFromAddressBook
+)
+VALUES
+(
+	@ItemID,
+	@MailboxPlan,
+	@EnableActiveSync,
+	@EnableIMAP,
+	@EnableMAPI,
+	@EnableOWA,
+	@EnablePOP,
+	@IsDefault,
+	@IssueWarningPct,
+	@KeepDeletedItemsDays,
+	@MailboxSizeMB,
+	@MaxReceiveMessageSizeKB,
+	@MaxRecipients,
+	@MaxSendMessageSizeKB,
+	@ProhibitSendPct,
+	@ProhibitSendReceivePct,
+	@HideFromAddressBook
+)
+
+SET @MailboxPlanId = SCOPE_IDENTITY()
+
+RETURN
+
+GO
+
+
+
 
 
 
@@ -3112,6 +3194,11 @@ EXEC sp_executesql N'CREATE PROCEDURE [dbo].[AddLyncUserPlan]
 )
 AS
 
+IF ((SELECT Count(*) FROM LyncUserPlans WHERE ItemId = @ItemID) = 0)
+BEGIN
+	SET @IsDefault = 1
+END
+
 INSERT INTO LyncUserPlans
 (
 	ItemID,
@@ -3147,6 +3234,62 @@ GO
 
 
 
+ALTER PROCEDURE [dbo].[AddLyncUserPlan] 
+(
+	@LyncUserPlanId int OUTPUT,
+	@ItemID int,
+	@LyncUserPlanName	nvarchar(300),
+	@IM bit,
+	@Mobility bit,
+	@MobilityEnableOutsideVoice bit,
+	@Federation bit,
+	@Conferencing bit,
+	@EnterpriseVoice bit,
+	@VoicePolicy int,
+	@IsDefault bit
+)
+AS
+
+IF ((SELECT Count(*) FROM LyncUserPlans WHERE ItemId = @ItemID) = 0)
+BEGIN
+	SET @IsDefault = 1
+END
+
+
+INSERT INTO LyncUserPlans
+(
+	ItemID,
+	LyncUserPlanName,
+	IM,
+	Mobility,
+	MobilityEnableOutsideVoice,
+	Federation,
+	Conferencing,
+	EnterpriseVoice,
+	VoicePolicy,
+	IsDefault
+)
+VALUES
+(
+	@ItemID,
+	@LyncUserPlanName,
+	@IM,
+	@Mobility,
+	@MobilityEnableOutsideVoice,
+	@Federation,
+	@Conferencing,
+	@EnterpriseVoice,
+	@VoicePolicy,
+	@IsDefault
+)
+
+SET @LyncUserPlanId = SCOPE_IDENTITY()
+
+RETURN
+GO
+
+
+
 
 IF  NOT EXISTS (SELECT * FROM sys.objects WHERE type_desc = N'SQL_STORED_PROCEDURE' AND name = N'CheckLyncUserExists')
 BEGIN
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/App_GlobalResources/WebsitePanel_SharedResources.ascx.resx b/WebsitePanel/Sources/WebsitePanel.WebPortal/App_GlobalResources/WebsitePanel_SharedResources.ascx.resx
index 8e412c58..4ce46d09 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/App_GlobalResources/WebsitePanel_SharedResources.ascx.resx
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/App_GlobalResources/WebsitePanel_SharedResources.ascx.resx
@@ -2697,6 +2697,9 @@
   <data name="AuditLogTask.EXCHANGE_DELETE_MAILBOX" xml:space="preserve">
     <value>Delete mailbox</value>
   </data>
+  <data name="AuditLogTask.EXCHANGE_DELETE_MAILBOXPLAN" xml:space="preserve">
+    <value>Delete mailboxplan</value>
+  </data>
   <data name="AuditLogTask.EXCHANGE_DELETE_MAILBOX_ADDRESSES" xml:space="preserve">
     <value>Delete mailbox e-mail addresses</value>
   </data>
@@ -2889,6 +2892,9 @@
   <data name="Error.EXCHANGE_DELETE_MAILBOX" xml:space="preserve">
     <value>Error deleting mailbox. See audit log for more details.</value>
   </data>
+  <data name="Error.EXCHANGE_DELETE_MAILBOXPLAN" xml:space="preserve">
+    <value>Unable to delete mailboxplan. Make sure the mailbox plan is not assigned to any mailbox</value>
+  </data>
   <data name="Error.EXCHANGE_DELETE_ORG" xml:space="preserve">
     <value>Error deleting Exchange organization. See audit log for more details.</value>
   </data>