- Modified patch #10644 by drumm: fixed some broken URLs.  Patch modified to
  use /user/$uid instead of /user/$uid/edit (where possible).