Index: trunk/web/templates/list.tmpl
===================================================================
--- trunk/web/templates/list.tmpl	(revision 228)
+++ trunk/web/templates/list.tmpl	(revision 229)
@@ -28,10 +28,10 @@
 	<tr>
 	  <td>Memory</td>
-	  <td><input type="text" name="memory" value="$defaults.memory" size=3/> megabytes ($max_memory max)</td>
+	  <td><input type="text" name="memory" value="$defaults.memory" size=3/> MiB ($max_memory max)</td>
 	</tr>
 $errorRow('memory', $err)
 	<tr>
 	  <td>Disk</td>
-	  <td><input type="text" name="disk" value="$defaults.disk" size=3/> gigabytes (${"%0.1f" % ($max_disk-0.05)} max)</td>
+	  <td><input type="text" name="disk" value="$defaults.disk" size=3/> GiB (${"%0.1f" % ($max_disk-0.05)} max)</td>
 	</tr>
 $errorRow('disk', $err)
Index: trunk/web/templates/validation.py
===================================================================
--- trunk/web/templates/validation.py	(revision 228)
+++ trunk/web/templates/validation.py	(revision 229)
@@ -113,5 +113,6 @@
     if memory > maxMemory(user, machine, on):
         raise InvalidInput('memory', memory,
-                           'Maximum %s MiB' % maxMemory(user, machine))
+                           'Maximum %s MiB for %s' % (maxMemory(user, machine),
+                                                      user))
     return memory