Made more refactoring to users/views.py