-

diff --git a/Empire/src/main/java/com/empireminecraft/systems/residence/Residence.java b/Empire/src/main/java/com/empireminecraft/systems/residence/Residence.java
index 4ac4165..a36e70d 100644
--- a/Empire/src/main/java/com/empireminecraft/systems/residence/Residence.java
+++ b/Empire/src/main/java/com/empireminecraft/systems/residence/Residence.java
@@ -1824,6 +1824,13 @@ public class Residence {
                     ClaimedResidence area = rmanager.getByName(args[1]);
                     if (area != null) {
                         area.getPermissions().setOwner(args[2], true);
+                        if (area.getAddress() > 0) {
+                            Long userId = !area.isServerOwned() ? EmpireUser.getUserId(args[1]) : null;
+
+                            EmpireDb.executeUpdateAsync(
+                                "UPDATE residence SET owner_user_id = ? WHERE address = ?",
+                                userId, area.getAddress());
+                        }
                         player.sendMessage("§a" +
                             language.getPhrase("ResidenceOwnerChange", "§e " + args[1] + " §a.§e" + args[2] + "§a"));
                     } else {
@@ -1841,7 +1848,7 @@ public class Residence {
                             player.sendMessage("§c" + language.getPhrase("InvalidResidence"));
                             return true;
                         }
-                        res.getPermissions().setOwner("Server Land", false);
+                        res.getPermissions().setOwner("EmpireMinecraft", false);
                         player.sendMessage(
                             "§a" + language.getPhrase("ResidenceOwnerChange", "§e " + args[1] + " §a.§eServer Land§a"));
                     } else {
diff --git a/Empire/src/main/java/com/empireminecraft/systems/residence/protection/ResidenceManager.java b/Empire/src/main/java/com/empireminecraft/systems/residence/protection/ResidenceManager.java
index ba5c002..91cdd55 100644
--- a/Empire/src/main/java/com/empireminecraft/systems/residence/protection/ResidenceManager.java
+++ b/Empire/src/main/java/com/empireminecraft/systems/residence/protection/ResidenceManager.java
@@ -703,6 +703,13 @@ public class ResidenceManager {
 
                 res.setName(newName);
 
+                if (res.getAddress() > 0) {
+                    Long userId = !res.isServerOwned() ? EmpireUser.getUserId(args[1]) : null;
+
+                    EmpireDb.executeUpdateAsync(
+                            "UPDATE residence SET name = ? WHERE address = ?",
+                            userId, res.getAddress());
+                }
                 if (player != null) {
                     player.sendMessage("§a" + Residence.getLanguage()
                                                        .getPhrase("ResidenceRename",