Re-rolling changes to add uuid to /user/login responses.

Re-rolling changes to add uuid to /user/login responses, previous patch used $user which changed to $account for the controller.

Updates code for #3113585, unsure how to put together a change record but if guided in the right direction I can take a first stab.