Fix admin-console user-form bugs.

Looks like Django needed a little more hinting about how to handle our models in the admin ...