diff --git a/otp/login/AstronLoginManager.py b/otp/login/AstronLoginManager.py
index b783828..7ef6e95 100644
--- a/otp/login/AstronLoginManager.py
+++ b/otp/login/AstronLoginManager.py
@@ -1,11 +1,10 @@
 import json
-from datetime import datetime
 import time
+from datetime import datetime
 
-from direct.distributed.DistributedObjectGlobal import DistributedObjectGlobal
 from direct.directnotify import DirectNotifyGlobal
+from direct.distributed.DistributedObjectGlobal import DistributedObjectGlobal
 from otp.uberdog.AccountDetailRecord import AccountDetailRecord
-from otp.distributed.PotentialAvatar import PotentialAvatar
 
 class AstronLoginManager(DistributedObjectGlobal):
     notify = DirectNotifyGlobal.directNotify.newCategory('AstronLoginManager')
@@ -14,6 +13,7 @@ class AstronLoginManager(DistributedObjectGlobal):
         DistributedObjectGlobal.__init__(self, cr)
         self.doneEvent = None
         self._callback = None
+        self.userName = ''
 
     def handleRequestLogin(self, doneEvent):
         self.doneEvent = doneEvent
@@ -124,7 +124,7 @@ class AstronLoginManager(DistributedObjectGlobal):
 
     def sendCreateAvatar(self, avDNA, avName, avPosition):
         # avName isn't used. Sad!
-        self.sendUpdate('createAvatar', [avDNA.makeNetString(), avPosition])
+        self.sendUpdate('createAvatar', [avDNA.makeNetString(), index])
 
     def createAvatarResponse(self, avId):
         messenger.send('nameShopCreateAvatarDone', [avId])
diff --git a/toontown/ai/ToontownAIRepository.py b/toontown/ai/ToontownAIRepository.py
index cc8cdbf..0fa236f 100644
--- a/toontown/ai/ToontownAIRepository.py
+++ b/toontown/ai/ToontownAIRepository.py
@@ -1,5 +1,4 @@
 from direct.directnotify import DirectNotifyGlobal
-from direct.distributed.PyDatagram import *
 from toontown.distributed.ToontownInternalRepository import ToontownInternalRepository
 from toontown.distributed.ToontownDistrictAI import ToontownDistrictAI
 from otp.distributed.OtpDoGlobals import *