diff --git a/Plugins/org.secc.ChangeManager/org_secc/ChangeManager/ChangeRequests.ascx.cs b/Plugins/org.secc.ChangeManager/org_secc/ChangeManager/ChangeRequests.ascx.cs
index d3a3c5822..dcd2bac84 100644
--- a/Plugins/org.secc.ChangeManager/org_secc/ChangeManager/ChangeRequests.ascx.cs
+++ b/Plugins/org.secc.ChangeManager/org_secc/ChangeManager/ChangeRequests.ascx.cs
@@ -61,8 +61,9 @@ protected override void OnLoad( EventArgs e )
                 pEntityType.IncludeGlobalOption = false;
                 pEntityType.EntityTypes = entityTypes;
 
-                cbShowComplete.Checked = GetBlockUserPreference( "ShowComplete" ).AsBoolean();
-                pEntityType.SelectedValue = GetBlockUserPreference( "EntityType" );
+                var preferences = GetBlockPersonPreferences();
+                cbShowComplete.Checked = preferences.GetValue( "ShowComplete" ).AsBoolean();
+                pEntityType.SelectedValue = preferences.GetValue( "EntityType" );
 
                 BindGrid();
             }
@@ -133,8 +134,10 @@ protected void gRequests_RowSelected( object sender, Rock.Web.UI.Controls.RowEve
 
         protected void fRequests_ApplyFilterClick( object sender, EventArgs e )
         {
-            SetBlockUserPreference( "ShowComplete", cbShowComplete.Checked.ToString() );
-            SetBlockUserPreference( "EntityType", pEntityType.SelectedValue );
+            var preferences = GetBlockPersonPreferences();
+            preferences.SetValue( "ShowComplete", cbShowComplete.Checked.ToString() );
+            preferences.SetValue( "EntityType", pEntityType.SelectedValue );
+            preferences.Save();
             BindGrid();
         }
 
diff --git a/Plugins/org.secc.Cms/org_secc/Cms/CacheTagsCheckList.ascx.cs b/Plugins/org.secc.Cms/org_secc/Cms/CacheTagsCheckList.ascx.cs
index d7db68a26..b7c0b6947 100644
--- a/Plugins/org.secc.Cms/org_secc/Cms/CacheTagsCheckList.ascx.cs
+++ b/Plugins/org.secc.Cms/org_secc/Cms/CacheTagsCheckList.ascx.cs
@@ -150,12 +150,14 @@ protected void GetCacheTags()
 
         protected void Save()
         {
-            SetUserPreference( "checkbox-selected-values-preference", GetSelectedValues() );
+            var preferences = GetBlockPersonPreferences();
+            preferences.SetValue( "checkbox-selected-values-preference", GetSelectedValues() );
+            preferences.Save();
         }
 
         protected void LoadPreferences()
         {
-            string usersselectedvalues = GetUserPreference( "checkbox-selected-values-preference" );
+            string usersselectedvalues = GetBlockPersonPreferences().GetValue( "checkbox-selected-values-preference" );
             IEnumerable<string> setvalues = usersselectedvalues.Split( ',' ).ToList();
             cbl.SetValues( setvalues );
         }
diff --git a/Plugins/org.secc.Cms/org_secc/Cms/ContactGroupLeaders.ascx.cs b/Plugins/org.secc.Cms/org_secc/Cms/ContactGroupLeaders.ascx.cs
index c10c29996..8e2ac6b52 100644
--- a/Plugins/org.secc.Cms/org_secc/Cms/ContactGroupLeaders.ascx.cs
+++ b/Plugins/org.secc.Cms/org_secc/Cms/ContactGroupLeaders.ascx.cs
@@ -54,7 +54,7 @@ namespace RockWeb.Plugins.org_secc.Cms
     [BooleanField( "Save Communication History", "Should a record of this communication be saved to the recipient's profile", false, "", 14 )]
     [LavaCommandsField( "Enabled Lava Commands", "The Lava commands that should be enabled for this HTML block.", false, order: 15 )]
     [BooleanField( "Enable SMS", "Enable messages being sent by SMS when it is the user's preferred communication method.", false, order: 16 )]
-    [DefinedValueField( "611bde1f-7405-4d16-8626-ccfedb0e62be", "SMS From Number", "The SMS Phone Number that the message should come from", false, false, "86604119-a222-4b35-9cd3-1a78db1b7b17", "", order: 17 )]
+    [SystemPhoneNumberField( "SMS From Number", "The SMS Phone Number that the message should come from", false, false, "86604119-a222-4b35-9cd3-1a78db1b7b17", "", order: 17 )]
     [CodeEditorField( "SMS Message Body", "The SMS message body.", CodeEditorMode.Lava, CodeEditorTheme.Rock, 200, false, "", "", 18 )]
 
     public partial class ContactGroupLeaders : Rock.Web.UI.RockBlock
@@ -372,7 +372,7 @@ private void SendTextMessage( List<Person> smsRecipients, Dictionary<string, obj
             communication.Subject = GetAttributeValue( "Subject" );
             communication.Message = GetAttributeValue( "MessageBody" );
 
-            communication.SMSFromDefinedValueId = DefinedValueCache.GetId( GetAttributeValue( "SMSFromNumber" ).AsGuid() );
+            communication.SmsFromSystemPhoneNumberId = SystemPhoneNumberCache.Get( GetAttributeValue( "SMSFromNumber" ).AsGuid() )?.Id;
             communication.SMSMessage = GetAttributeValue( "SMSMessageBody" );
             communication.FutureSendDateTime = null;
 
diff --git a/Plugins/org.secc.Cms/org_secc/Cms/LoginStatus.ascx.cs b/Plugins/org.secc.Cms/org_secc/Cms/LoginStatus.ascx.cs
index 739ec8fc5..c3d3f3b57 100644
--- a/Plugins/org.secc.Cms/org_secc/Cms/LoginStatus.ascx.cs
+++ b/Plugins/org.secc.Cms/org_secc/Cms/LoginStatus.ascx.cs
@@ -101,7 +101,9 @@ protected override void OnLoad( EventArgs e )
                 //Reset our clock when we look at our dashboard.
                 if ( PageCache.Guid == GetAttributeValue( "MyDashboardPage" ).AsGuid() )
                 {
-                    SetUserPreference( "LastViewedDashboard", Rock.RockDateTime.Now.ToString() );
+                    var preferences = GetBlockPersonPreferences();
+                    preferences.SetValue( "LastViewedDashboard", Rock.RockDateTime.Now.ToString() );
+                    preferences.Save();
                 }
 
                 phHello.Visible = true;
@@ -208,7 +210,7 @@ protected override void OnLoad( EventArgs e )
 
         private int GetNotificationCount()
         {
-            var lastChecked = GetUserPreference( "LastViewedDashboard" ).AsDateTime();
+            var lastChecked = GetBlockPersonPreferences().GetValue( "LastViewedDashboard" ).AsDateTime();
             if ( !lastChecked.HasValue )
             {
                 lastChecked = RockDateTime.Now.AddMonths( -3 );