big changes in users/views.py