Index: trunk/web/templates/list.tmpl
===================================================================
--- trunk/web/templates/list.tmpl	(revision 161)
+++ trunk/web/templates/list.tmpl	(revision 162)
@@ -72,5 +72,5 @@
 	<tr>
 	  <td>Name</td>
-	  <td>${user.username}_<input type="text" name="name" value=""/></td>
+	  <td><input type="text" name="name" value=""/></td>
 	</tr>
 	<tr>
Index: trunk/web/templates/main.py
===================================================================
--- trunk/web/templates/main.py	(revision 161)
+++ trunk/web/templates/main.py	(revision 162)
@@ -354,5 +354,5 @@
     if not validMachineName(name):
         raise InvalidInput('name', name)
-    name = user.username + '_' + name.lower()
+    name = name.lower()
 
     if Machine.get_by(name=name):