Tweaked user-partial