diff --git a/TODO b/TODO
index baed4b9255..58b6d5e48f 100644
--- a/TODO
+++ b/TODO
@@ -1233,6 +1233,8 @@ Features:
   - when reloading configuration, apply new cgroup configuration
   - when recursively showing the cgroup hierarchy, optionally also show
     the hierarchies of child processes
+- add settings for cgroup.max.descendants and cgroup.max.depth,
+  maybe use them for user@.service
 
 * transient units:
   - add field to transient units that indicate whether systemd or somebody else saves/restores its settings, for integration with libvirt
diff --git a/units/user/app.slice b/units/user/app.slice
index 0c73135e17..eac50645a4 100644
--- a/units/user/app.slice
+++ b/units/user/app.slice
@@ -10,3 +10,6 @@
 [Unit]
 Description=User Application Slice
 Documentation=man:systemd.special(7)
+
+[Slice]
+CPUWeight=100
diff --git a/units/user/background.slice b/units/user/background.slice
index 8f2a0949bd..a9767753b3 100644
--- a/units/user/background.slice
+++ b/units/user/background.slice
@@ -10,3 +10,6 @@
 [Unit]
 Description=User Background Tasks Slice
 Documentation=man:systemd.special(7)
+
+[Slice]
+CPUWeight=30
diff --git a/units/user/session.slice b/units/user/session.slice
index 3d99d51bc5..aa12b7d03c 100644
--- a/units/user/session.slice
+++ b/units/user/session.slice
@@ -10,3 +10,6 @@
 [Unit]
 Description=User Core Session Slice
 Documentation=man:systemd.special(7)
+
+[Slice]
+CPUWeight=100
diff --git a/units/user@.service.in b/units/user@.service.in
index 85fc3c907e..eff0d5bcb6 100644
--- a/units/user@.service.in
+++ b/units/user@.service.in
@@ -21,7 +21,7 @@ Type=notify
 ExecStart={{ROOTLIBEXECDIR}}/systemd --user
 Slice=user-%i.slice
 KillMode=mixed
-Delegate=pids memory
+Delegate=pids memory cpu
 TasksMax=infinity
 TimeoutStopSec=120s
 KeyringMode=inherit