UPDATED targetUser factory and related controllers and templates