Index: trunk/web/validation.py
===================================================================
--- trunk/web/validation.py	(revision 252)
+++ trunk/web/validation.py	(revision 253)
@@ -38,9 +38,9 @@
     returned.
     """
-    if not on:
-        return MAX_MEMORY_SINGLE
     if machine is not None and machine.memory > MAX_MEMORY_SINGLE:
         # If they've been blessed, let them have it
         return machine.memory
+    if not on:
+        return MAX_MEMORY_SINGLE
     machines = getMachinesByOwner(user, machine)
     active_machines = [x for x in machines if g.uptimes[x]]