Updates based on @andyberry88's feedback
More updates based on @andyberry's dry-run
Minor tweaks
Clarify why we need to get the User Service