diff --git a/assignment-client/src/Agent.cpp b/assignment-client/src/Agent.cpp
index d27845f337..913f22be18 100644
--- a/assignment-client/src/Agent.cpp
+++ b/assignment-client/src/Agent.cpp
@@ -101,7 +101,7 @@ void Agent::run() {
     scriptedAvatar.setUUID(_scriptEngine.getDataServerScriptingInterface().getUUID());
     
     // give this AvatarData object to the script engine
-    _scriptEngine.setAvatarData(&scriptedAvatar);
+    _scriptEngine.setAvatarData(&scriptedAvatar, "Avatar");
 
     _scriptEngine.setScriptContents(scriptContents);
     _scriptEngine.run();    
diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index 8e1ba5afa1..b59893a10e 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -4261,6 +4261,9 @@ void Application::loadScript(const QString& fileNameString){
     // we can use the same ones from the application.
     scriptEngine->getVoxelsScriptingInterface()->setPacketSender(&_voxelEditSender);
     scriptEngine->getParticlesScriptingInterface()->setPacketSender(&_particleEditSender);
+    
+    // hook our avatar object into this script engine
+    scriptEngine->setAvatarData(&_myAvatar, "MyAvatar");
 
     QThread* workerThread = new QThread(this);
 
diff --git a/libraries/script-engine/src/ScriptEngine.cpp b/libraries/script-engine/src/ScriptEngine.cpp
index c56bb1ada7..c335f30093 100644
--- a/libraries/script-engine/src/ScriptEngine.cpp
+++ b/libraries/script-engine/src/ScriptEngine.cpp
@@ -71,14 +71,14 @@ ScriptEngine::~ScriptEngine() {
     //printf("ScriptEngine::~ScriptEngine()...\n");
 }
 
-void ScriptEngine::setAvatarData(AvatarData* avatarData) {
+void ScriptEngine::setAvatarData(AvatarData* avatarData, char* objectName) {
     _avatarData = avatarData;
     
     // remove the old Avatar property, if it exists
-    _engine.globalObject().setProperty("Avatar", QScriptValue());
+    _engine.globalObject().setProperty(objectName, QScriptValue());
     
     // give the script engine the new Avatar script property
-    registerGlobalObject("Avatar", _avatarData);
+    registerGlobalObject(objectName, _avatarData);
 }
 
 void ScriptEngine::setupMenuItems() {
diff --git a/libraries/script-engine/src/ScriptEngine.h b/libraries/script-engine/src/ScriptEngine.h
index 8be3883f39..a153d46bb4 100644
--- a/libraries/script-engine/src/ScriptEngine.h
+++ b/libraries/script-engine/src/ScriptEngine.h
@@ -59,7 +59,7 @@ public:
     void setIsAvatar(bool isAvatar) { _isAvatar = isAvatar; }
     bool isAvatar() const { return _isAvatar; }
     
-    void setAvatarData(AvatarData* avatarData);
+    void setAvatarData(AvatarData* avatarData, char* objectName);
 
 public slots:
     void init();