Merged views/user.py in views/users.py