Agent Auto Lookup

Correct agent save for agent/users.