Refixed login system
Fixed views.py error that screws up the merge.