diff --git a/TODO b/TODO
index c51205175..880123d68 100644
--- a/TODO
+++ b/TODO
@@ -17,6 +17,8 @@ Bugfixes:
 
 Features:
 
+* for socket units don't inherit global stdout setting.
+
 * internal restart counter for units (focus on auto-respawn)
 
 * finer-grained auto-respawn settings (rate-limit)
diff --git a/src/mount.c b/src/mount.c
index 829c2cc13..2fc799a6e 100644
--- a/src/mount.c
+++ b/src/mount.c
@@ -320,7 +320,10 @@ static bool needs_quota(MountParameters *p) {
                 return false;
 
         return mount_test_option(p->options, "usrquota") ||
-                mount_test_option(p->options, "grpquota");
+                mount_test_option(p->options, "grpquota") ||
+                mount_test_option(p->options, "quota") ||
+                mount_test_option(p->options, "usrjquota") ||
+                mount_test_option(p->options, "grpjquota");
 }
 
 static int mount_add_fstab_links(Mount *m) {