diff --git a/source/blender/blenkernel/intern/verse_node.c b/source/blender/blenkernel/intern/verse_node.c
index 570d3a2df5c..a73313e7a34 100644
--- a/source/blender/blenkernel/intern/verse_node.c
+++ b/source/blender/blenkernel/intern/verse_node.c
@@ -32,6 +32,7 @@
 #include "MEM_guardedalloc.h"
 
 #include "DNA_listBase.h"
+#include "DNA_userdef_types.h"
 
 #include "BLI_dynamiclist.h"
 #include "BLI_blenlib.h"
@@ -616,10 +617,7 @@ static void cb_node_create(
 				vnode->data = create_object_data();
 				/* set up avatar's name */
 				if(node_id == session->avatar) {
-					char *client_name;
-					client_name = verse_client_name();
-					verse_send_node_name_set(node_id, client_name);
-					MEM_freeN(client_name);
+					verse_send_node_name_set(node_id, U.verseuser);
 				}
 				else if(session->flag & VERSE_AUTOSUBSCRIBE) {
 					/* subscribe to changes of object node transformations */
diff --git a/source/blender/makesdna/DNA_userdef_types.h b/source/blender/makesdna/DNA_userdef_types.h
index 936321dd312..1d2a8ce4b2c 100644
--- a/source/blender/makesdna/DNA_userdef_types.h
+++ b/source/blender/makesdna/DNA_userdef_types.h
@@ -166,13 +166,14 @@ typedef struct UserDef {
 	struct SolidLight light[3];
 	short tw_hotspot, tw_flag, tw_handlesize, tw_size;
 	int textimeout, texcollectrate;
-        int memcachelimit;
-        short frameserverport;
+	int memcachelimit;
+	short frameserverport;
 	short pad;
 	short obcenter_dia;
 	short rvisize;		/* rotating view icon size */
 	short rvibright;	/* rotating view icon brightness */
 	char versemaster[160];
+	char verseuser[160];
 	short pad1;
 } UserDef;
 
diff --git a/source/blender/src/space.c b/source/blender/src/space.c
index 1971452d2fe..a22b8ca5e30 100644
--- a/source/blender/src/space.c
+++ b/source/blender/src/space.c
@@ -3021,6 +3021,10 @@ void drawinfospace(ScrArea *sa, void *spacedata)
 			(xpos+edgsp),y3label+buth+5,mpref*2,buth,
 			U.versemaster, 1.0, 63.0, 0, 0,
 			"The Verse Master-server IP");
+		uiDefBut(block, TEX, 0, "Verse Username: ",
+			(xpos+edgsp)+mpref*2+10,y3label+buth+5,mpref*2,buth,
+			U.verseuser, 1.0, 63.0, 0, 0,
+			"The Verse user name");
 #endif
 
 		uiDefBut(block, LABEL,0,"Solid OpenGL light:",
diff --git a/source/blender/src/usiblender.c b/source/blender/src/usiblender.c
index 666e4d9df07..0bf1ae61dc7 100644
--- a/source/blender/src/usiblender.c
+++ b/source/blender/src/usiblender.c
@@ -356,6 +356,9 @@ static void init_userdef_file(void)
 	if(strlen(U.versemaster)<1) {
 			strcpy(U.versemaster, "master.uni-verse.org");
 	}
+	if(strlen(U.verseuser)<1) {
+			strcpy(U.verseuser, verse_client_name());
+	}
 #endif
 
 }