rename and add missing fields in user model
use has_entries instead of equal_to for clearer messages
fix pep8 warnings
remove unnecessary steps when editing a user
fix quotes around caller_id