Wip user quota 2

User quota, after adding the changes suggested by Josh.