diff --git a/src/main/java/world/bentobox/bentobox/api/commands/admin/AdminUnregisterCommand.java b/src/main/java/world/bentobox/bentobox/api/commands/admin/AdminUnregisterCommand.java
index 74ca53aed..594eb317d 100644
--- a/src/main/java/world/bentobox/bentobox/api/commands/admin/AdminUnregisterCommand.java
+++ b/src/main/java/world/bentobox/bentobox/api/commands/admin/AdminUnregisterCommand.java
@@ -15,7 +15,7 @@ public class AdminUnregisterCommand extends CompositeCommand {
     public AdminUnregisterCommand(CompositeCommand parent) {
         super(parent, "unregister");
     }
-    
+
     @Override
     public void setup() {
         setPermission("admin.unregister");
@@ -36,14 +36,11 @@ public class AdminUnregisterCommand extends CompositeCommand {
             user.sendMessage("general.errors.unknown-player", TextVariables.NAME, args.get(0));
             return false;
         }
-        if (!getIslands().hasIsland(getWorld(), targetUUID)) {
+        if (!getIslands().hasIsland(getWorld(), targetUUID) && !getIslands().inTeam(getWorld(), targetUUID)) {
             user.sendMessage("general.errors.player-has-no-island");
             return false;
         }
-        if (getIslands().inTeam(getWorld(), targetUUID)) {
-            user.sendMessage("commands.admin.unregister.cannot-unregister-team-player");
-            return false;
-        }
+
         // Unregister island
         user.sendMessage("commands.admin.unregister.unregistered-island", "[xyz]", Util.xyz(getIslands().getIsland(getWorld(), targetUUID).getCenter().toVector()));
         getIslands().removePlayer(getWorld(), targetUUID);
@@ -51,7 +48,7 @@ public class AdminUnregisterCommand extends CompositeCommand {
         user.sendMessage("general.success");
         return true;
     }
-    
+
     @Override
     public Optional<List<String>> tabComplete(User user, String alias, List<String> args) {
         String lastArg = !args.isEmpty() ? args.get(args.size()-1) : "";
diff --git a/src/main/java/world/bentobox/bentobox/api/commands/admin/team/AdminTeamAddCommand.java b/src/main/java/world/bentobox/bentobox/api/commands/admin/team/AdminTeamAddCommand.java
index 2f49306f5..ff9c342b8 100644
--- a/src/main/java/world/bentobox/bentobox/api/commands/admin/team/AdminTeamAddCommand.java
+++ b/src/main/java/world/bentobox/bentobox/api/commands/admin/team/AdminTeamAddCommand.java
@@ -6,6 +6,7 @@ import java.util.UUID;
 import world.bentobox.bentobox.api.commands.CompositeCommand;
 import world.bentobox.bentobox.api.localization.TextVariables;
 import world.bentobox.bentobox.api.user.User;
+import world.bentobox.bentobox.database.objects.Island;
 
 public class AdminTeamAddCommand extends CompositeCommand {
 
@@ -60,9 +61,15 @@ public class AdminTeamAddCommand extends CompositeCommand {
         User owner = User.getInstance(ownerUUID);
         owner.sendMessage("commands.island.team.invite.accept.name-joined-your-island", TextVariables.NAME, getPlugin().getPlayers().getName(targetUUID));
         target.sendMessage("commands.island.team.invite.accept.you-joined-island", TextVariables.LABEL, getTopLabel());
-        getIslands().getIsland(getWorld(), ownerUUID).addMember(targetUUID);
-        user.sendMessage("general.success");
-        return true;
+        Island teamIsland = getIslands().getIsland(getWorld(), ownerUUID);
+        if (teamIsland != null) {
+            getIslands().setJoinTeam(teamIsland, targetUUID);
+            user.sendMessage("general.success");
+            return true;
+        } else {
+            user.sendMessage("general.errors.player-has-no-island");
+            return false;
+        }
 
     }
 
diff --git a/src/test/java/world/bentobox/bentobox/api/commands/admin/AdminUnregisterCommandTest.java b/src/test/java/world/bentobox/bentobox/api/commands/admin/AdminUnregisterCommandTest.java
index 6cfde4bc4..40729120e 100644
--- a/src/test/java/world/bentobox/bentobox/api/commands/admin/AdminUnregisterCommandTest.java
+++ b/src/test/java/world/bentobox/bentobox/api/commands/admin/AdminUnregisterCommandTest.java
@@ -147,19 +147,6 @@ public class AdminUnregisterCommandTest {
         Mockito.verify(user).sendMessage(Mockito.eq("general.errors.player-has-no-island"));
     }
 
-    /**
-     * Test method for .
-     */
-    @Test
-    public void testExecuteInTeam() {
-        when(im.inTeam(Mockito.any(),Mockito.any())).thenReturn(true);
-        String[] name = {"tastybento"};
-        when(pm.getUUID(Mockito.any())).thenReturn(notUUID);
-        AdminUnregisterCommand itl = new AdminUnregisterCommand(ac);
-        assertFalse(itl.execute(user, itl.getLabel(), Arrays.asList(name)));
-        Mockito.verify(user).sendMessage("commands.admin.unregister.cannot-unregister-team-player");
-    }
-
     /**
      * Test method for .
      */
diff --git a/src/test/java/world/bentobox/bentobox/api/commands/admin/team/AdminTeamAddCommandTest.java b/src/test/java/world/bentobox/bentobox/api/commands/admin/team/AdminTeamAddCommandTest.java
index d463db8ee..fdc52571d 100644
--- a/src/test/java/world/bentobox/bentobox/api/commands/admin/team/AdminTeamAddCommandTest.java
+++ b/src/test/java/world/bentobox/bentobox/api/commands/admin/team/AdminTeamAddCommandTest.java
@@ -294,7 +294,7 @@ public class AdminTeamAddCommandTest {
 
         // Success
         assertTrue(itl.execute(user, itl.getLabel(), Arrays.asList(name)));
-        Mockito.verify(island).addMember(notUUID);
+        Mockito.verify(im).setJoinTeam(Mockito.eq(island), Mockito.eq(notUUID));
         Mockito.verify(user).sendMessage(Mockito.eq("general.success"));
     }