diff --git a/cmd/rove-server/internal/server.go b/cmd/rove-server/internal/server.go
index 42392f3..7debe0a 100644
--- a/cmd/rove-server/internal/server.go
+++ b/cmd/rove-server/internal/server.go
@@ -210,17 +210,5 @@ func (s *Server) SpawnRoverForAccount(account string) (string, error) {
 		return "", err
 	}
 
-	err = s.world.Accountant.AssignData(account, "rover", inst)
-	if err != nil {
-		log.Printf("Failed to assign rover to account, %s", err)
-
-		// Try and clear up the rover
-		if err := s.world.DestroyRover(inst); err != nil {
-			log.Printf("Failed to destroy rover after failed rover assign: %s", err)
-		}
-
-		return "", err
-	}
-
 	return inst, nil
 }
diff --git a/pkg/rove/world.go b/pkg/rove/world.go
index 922ab70..09d271a 100644
--- a/pkg/rove/world.go
+++ b/pkg/rove/world.go
@@ -97,7 +97,7 @@ func (w *World) SpawnRover(account string) (string, error) {
 	// Append the rover to the list
 	w.Rovers[rover.Name] = rover
 
-	return rover.Name, nil
+	return rover.Name, w.Accountant.AssignData(account, "rover", rover.Name)
 }
 
 // GetRover gets a specific rover by name